Fixes #2 - Refactoring Code so its not one 28k line blob #17

coolestskinnieinthejungle · 2021-06-14T04:13:35Z

coolestskinnieinthejungle commented

2021-06-14 04:13:35 +00:00

Stage: Pushing back to original repo

Issue Reference: https://git.snootgame.xyz/PrincipalSpears/SnootGame/issues/2

Description of Pull Request:

this should provide the appropriate fixes for issues #2, #4, and #5

for more specific info on changes/fixes included:

https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/1
https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/2

tl;dr -

refactored code into stages per chapter and each chapter/route has it's own .rpy file (goodbye soulful 28k blob we will miss u)
fixed crash - Couldn't find file stella/stella shocked alt.png - is now the appropriate stella shock alt.png
fixed "stage wires" choice bugged/missing dialogue

#### Stage: Pushing back to original repo #### Issue Reference: https://git.snootgame.xyz/PrincipalSpears/SnootGame/issues/2 ## Description of Pull Request: this should provide the appropriate fixes for issues #2, #4, and #5 for more specific info on changes/fixes included: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/1 https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/2 tl;dr - * refactored code into stages per chapter and each chapter/route has it's own `.rpy` file (goodbye soulful 28k blob we will miss u) * fixed crash - Couldn't find file `stella/stella shocked alt.png` - is now the appropriate `stella shock alt.png` * fixed "stage wires" choice bugged/missing dialogue

coolestskinnieinthejungle added 21 commits 2021-06-14 04:13:36 +00:00

fun sanity czech 7541c8e25b

making sure i didnt fuck up my dev env lol

initial organizations into new file format 8e289aca06

this would've been done 1 hour earlier if pacman didn't fuck up my xfce4 conf

first five parts now with proper naming! 4d520f89ff

now everything up until the route splits 9f4f3dde6b

fates are decided and also given their own file c6baa7d575

shooter end reformatted 4ce721fdbb

doomer end reformatted 01c9909d9d

tradoomer end reformatted f1e70f0db2

bloomer end reformatted 47d53bb065

goodbye old script high a13b151125

meant to delete this useless empty file. 7648bf2a59

go away

renpy does not like dots in labels pt.1 - integers for chapters 535298892b

fugg

renpy does not like dots in labels pt.2 - fixed labels and jumps cdec7f5ddd

yay

more appropriate title / tweak for these two 027631b3cf

fixed a few more script names that were activating my ocd almonds 6411935284

whoops i fucked up some formatting and a label name aa9886848a

fixed now doe

Merge pull request 'issue2-init' (#1 ) from issue2-init into master 74eb44ca99

Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/1

stella shocked img import fix from lazysnake b8c035b305

LeftStage var handling fix from lazysnake 1e4d2f9f4b

removing a comment 26c63c4aa1

Merge pull request 'issue2-tweaks' (#2 ) from issue2-tweaks into master 26f2a588b7

Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/2

MichaelYick commented

2021-06-14 06:27:53 +00:00

seems to be working on my end, anyone wanna try this out to make sure its all functional?

CoffeeAnon commented

2021-06-14 19:37:09 +00:00

First-time contributor

I've found a major issue when testing on Windows 10; the filenames of script files 11D and 13D contain too many characters, causing renpy to return a fatal error on launch when executing the build.
After some testing, it seems that shortening the filenames fixes the error entirely.

Oh and it seems there's some leftover code strewn about, resulting in a few "soft" errors:

Line 930 in 8.anon-and-fang-study-together.rpy needs to replaced with "jump chapter_9".
Line 856 in 13A.fang-loses-it-after-losing-prom-queen.rpy should probably be xalign instead of align.
Line 470 in 14C.good-ending.rpy refers to a "fang c neutral" image, but not only is this not defined, the image doesn't exist.

I've found a major issue when testing on Windows 10; the filenames of script files 11D and 13D contain too many characters, causing renpy to return a fatal error on launch when executing the build. After some testing, it seems that shortening the filenames fixes the error entirely. Oh and it seems there's some leftover code strewn about, resulting in a few "soft" errors: * Line 930 in 8.anon-and-fang-study-together.rpy needs to replaced with "jump chapter_9". * Line 856 in 13A.fang-loses-it-after-losing-prom-queen.rpy should probably be xalign instead of align. * Line 470 in 14C.good-ending.rpy refers to a "fang c neutral" image, but not only is this not defined, the image doesn't exist.

👀 1

coolestskinnieinthejungle commented

2021-06-14 21:35:26 +00:00

I've found a major issue when testing on Windows 10; the filenames of script files 11D and 13D contain too many characters, causing renpy to return a fatal error on launch when executing the build.

weird that my dev machine didn't catch this, but great find. easy enough to fix, will abridge those two enough that they're still familiar

Line 930 in 8.anon-and-fang-study-together.rpy needs to replaced with "jump chapter_9".

this was a shortsight on my end - thought i removed/replaced the previous jump/label statements but this one stuck around it seems. fixing

Line 856 in 13A.fang-loses-it-after-losing-prom-queen.rpy should probably be xalign instead of align.

easy enough fix, good catch

Line 470 in 14C.good-ending.rpy refers to a "fang c neutral" image, but not only is this not defined, the image doesn't exist.

i'll leave @PrincipalSpears to pass judgment on this one

> I've found a major issue when testing on Windows 10; the filenames of script files 11D and 13D contain too many characters, causing renpy to return a fatal error on launch when executing the build. weird that my dev machine didn't catch this, but great find. easy enough to fix, will abridge those two enough that they're still familiar > * Line 930 in 8.anon-and-fang-study-together.rpy needs to replaced with "jump chapter_9". this was a shortsight on my end - thought i removed/replaced the previous jump/label statements but this one stuck around it seems. fixing > * Line 856 in 13A.fang-loses-it-after-losing-prom-queen.rpy should probably be xalign instead of align. easy enough fix, good catch > * Line 470 in 14C.good-ending.rpy refers to a "fang c neutral" image, but not only is this not defined, the image doesn't exist. i'll leave @PrincipalSpears to pass judgment on this one

MichaelYick commented

2021-06-14 23:22:38 +00:00

Line 470 in 14C.good-ending.rpy refers to a "fang c neutral" image, but not only is this not defined, the image doesn't exist.

For some reason the fang future sets folder has a bunch of duplicate sprites and is missing the neutral sprite.

>Line 470 in 14C.good-ending.rpy refers to a "fang c neutral" image, but not only is this not defined, the image doesn't exist. For some reason the fang future sets folder has a bunch of duplicate sprites and is missing the neutral sprite.

coolestskinnieinthejungle referenced this pull request from coolestskinnieinthejungle/SnootGame

2021-06-15 00:17:56 +00:00

issue2-extratweaks #3

coolestskinnieinthejungle commented

2021-06-15 00:21:14 +00:00

additional fixes for above now live on https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/src/branch/master

MichaelYick changed title from ~~WIP: my/master -> your/Patchy-Patch5~~ to WIP: Refactoring Code so its not one 28k line blob

2021-06-15 11:25:03 +00:00

coolestskinnieinthejungle added 1 commit 2021-06-15 16:06:15 +00:00

Merge branch 'Patchy-Patch5' into master a6423e3ab0

CoffeeAnon commented

2021-06-15 20:38:36 +00:00

First-time contributor

Aside from a missing dimstage.png background during the concert blackout, all seems to be in working order.

Another thing of note (which isn't really part of this PR) is that line 790 in file 7.concert-day.rp contains "Ro" at the start of the sentence.
I think this a leftover reference to Rosa's character object?
Tell me if you want me to create a seperate issue/PR for this.

Aside from a missing dimstage.png background during the concert blackout, all seems to be in working order. Another thing of note (which isn't really part of this PR) is that line 790 in file 7.concert-day.rp contains "Ro" at the start of the sentence. I think this a leftover reference to Rosa's character object? Tell me if you want me to create a seperate issue/PR for this.

coolestskinnieinthejungle commented

2021-06-15 22:51:52 +00:00

@CoffeeAnon no problem, #23 has a ton more good linting/formatting things to fix so i'll likely be including that as well as what you mentioned in this PR as well. cheers

MichaelYick commented

2021-06-15 23:20:35 +00:00

I remember putting down a patch file that fixed these exact issues. I'll just upload the full script from that patch (it was in /tmp and I haven't restarted my computer in days, lucky man I am)

MichaelYick commented

2021-06-15 23:21:47 +00:00

internet is so slow that the file took longer to upload than that comment did to type. The file is 27 kb.

stella.txt

26 KiB

MichaelYick added a new dependency 2021-06-15 23:33:29 +00:00

#12 Coreography currently sucks, should be improved

MichaelYick added 2 commits 2021-06-16 09:54:39 +00:00

cleaned up bad route for this scene 746f4d5e05

Merge pull request 'cleaned up bad route for this scene' (#4 ) from Cavemanon/SnootGame:pr/17 into master dee9282229

Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/4

MichaelYick commented

2021-06-16 09:55:22 +00:00

I think we're at a point where this is ready to deploy

MichaelYick commented

2021-06-16 10:52:20 +00:00

also before we merge this, can you weigh in a bit on #27? It's about licensing and Snoot Game being on Steam. Just some legal shemuckary we need to get out of the way before merging this stuff in.

coolestskinnieinthejungle commented

2021-06-16 15:56:56 +00:00

@PrincipalSpears sent ;)

going to clone the target locally too in case git decides to fuck up

@PrincipalSpears sent ;) going to clone the target locally too in case git decides to fuck up

coolestskinnieinthejungle commented

2021-06-16 17:00:31 +00:00

was able to lint and get everything on #23 squashed except game/script.rpy:11046 'dimstage' is not an image.

was able to lint and get everything on #23 squashed except `game/script.rpy:11046 'dimstage' is not an image.`

coolestskinnieinthejungle referenced this pull request

2021-06-16 17:01:38 +00:00

Lint errors in script #23

MichaelYick commented

2021-06-16 20:58:23 +00:00

'game/script.rpy:11046 'dimstage' is not an image'
IIRC that has to do with the cablemanagement scene and I fixed that.

'game/script.rpy:11046 'dimstage' is not an image' IIRC that has to do with the cablemanagement scene and I fixed that.

👍 1

MichaelYick referenced this pull request

2021-06-17 11:26:32 +00:00

Stella cannot read fortune before concert #32

MichaelYick changed title from ~~WIP: Refactoring Code so its not one 28k line blob~~ to WIP: Fixes #2 - Refactoring Code so its not one 28k line blob

2021-06-18 01:58:17 +00:00

coolestskinnieinthejungle added 4 commits 2021-06-18 02:45:27 +00:00

refactor to the refactor ba47180cc8

removed a empty line and typo in title fffe7b520a

renaming again dda353b81c

Merge pull request 'issue34-init' (#6 ) from issue34-init into master 947826bd8b

Reviewed-on: https://git.snootgame.xyz/coolestskinnieinthejungle/SnootGame/pulls/6

MichaelYick changed title from ~~WIP: Fixes #2 - Refactoring Code so its not one 28k line blob~~ to Fixes #2 - Refactoring Code so its not one 28k line blob

2021-06-18 05:21:20 +00:00

MichaelYick commented

2021-06-18 05:36:53 +00:00

running through a bit, seems good to me. Code is much cleaner now. Although, can we rename either the label 'start' to 'storyline' or the file 'storyline.rpy' to 'start.rpy' as to make everything match up? Besides this, everything looks pretty clean. Anyone else wanna chime in on this or do some more extensive testing?

MichaelYick referenced this pull request

2021-06-18 06:17:27 +00:00

Compressing assets to reduce size #24

coolestskinnieinthejungle commented

2021-06-18 07:05:47 +00:00

sure i can whip that up in the morning

coolestskinnieinthejungle commented

2021-06-18 18:22:00 +00:00

can we rename either the label 'start' to 'storyline' or the file 'storyline.rpy' to 'start.rpy' as to make everything match up?

so renpy expects a "start" label (found that out the hard way) so to avoid fucking with baseline renpy code i did this

script.rpy

label start:
    $ fangscore = 0
    $ anonscore = 0
    $ tradwife = False
    pause 1.0
    call storyline

storyline.rpy

label storyline:
    call chapter_1
    call chapter_2
    call chapter_3
    (...)
    call ending
    return

let me know if that works or if it's still retarded

> can we rename either the label 'start' to 'storyline' or the file 'storyline.rpy' to 'start.rpy' as to make everything match up? so renpy expects a "start" label (found that out the hard way) so to avoid fucking with baseline renpy code i did this `script.rpy` ```py label start: $ fangscore = 0 $ anonscore = 0 $ tradwife = False pause 1.0 call storyline ``` `storyline.rpy` ```py label storyline: call chapter_1 call chapter_2 call chapter_3 (...) call ending return ``` let me know if that works or if it's still retarded

coolestskinnieinthejungle referenced this pull request from coolestskinnieinthejungle/SnootGame

2021-06-18 18:25:05 +00:00

issue34-bugfixes #7

MichaelYick referenced this pull request

2021-06-18 22:01:11 +00:00

Wrong Backgrounds #25

MichaelYick commented

2021-06-18 22:04:44 +00:00

Okay guys, im going ahead with the merge. Things seem to work as usual

what could possibly go wrong?

Okay guys, im going ahead with the merge. Things seem to work as usual what could possibly go wrong?

clueless.png