From 3512ac6f1032aa8eef530232b59d92311fc904e8 Mon Sep 17 00:00:00 2001 From: coolestskinnieinthejungle Date: Wed, 16 Jun 2021 11:30:17 -0500 Subject: [PATCH 1/3] a fuckload of linting fixes --- game/script.rpy | 6 +++--- game/script/11.school-assignment-and-route-lock.rpy | 4 ++-- ...angs'-pronouns-right,-and-she's-smug-about-it.rpy | 2 +- game/script/12C.anon-fang-lovey-dovey.rpy | 12 ++++++------ .../13C.fang-and-anon-go-to-beach-and-prom.rpy | 4 ++-- ...5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy | 2 +- .../6.anon-helps-fang-find-a-venue-for-band.rpy | 2 +- game/script/7.concert-day.rpy | 1 + 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/game/script.rpy b/game/script.rpy index 292ab6a..bdc9cec 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -113,8 +113,8 @@ image stellaSilo = im.Flip(im.MatrixColor("stella/stella neutral.png",im.matrix. image rosaSilo = im.MatrixColor("rosa/rosa neutral.png",im.matrix.brightness(-1)) image naomiSilo = im.MatrixColor("naomi/naomi neutral.png",im.matrix.brightness(-1)) image naserSilo = im.Flip(im.MatrixColor("naser/naser neutral.png",im.matrix.brightness(-1)), horizontal=True) -image fangSilo = im.MatrixColor("fang/fang neutral.png",im.matrix.brightness(-1)) -image fangAngrySilo = im.MatrixColor("fang/fang angry.png",im.matrix.brightness(-1)) +image fangSilo = im.MatrixColor("fang/basic set/fang neutral.png","im.matrix.brightness(-1)) +image fangAngrySilo = im.MatrixColor("fang/basic set/fang angry.png",im.matrix.brightness(-1)) #violence flips image fang kicking flip = im.Flip("fang/emotive set/fang kicking.png", horizontal=True) @@ -255,7 +255,7 @@ image naser annoyed flip = im.Flip("naser/naser annoyed.png", horizontal=True) image trish annoyed flip = im.Flip("trish/trish annoyed.png", horizontal=True) #embarrass flip -image fang embarrass flip = im.Flip("fang/emotive set/fang embarrass.png", horizontal=True) +image fang embarrass flip = im.Flip("fang/emotive set/fang embarass.png", horizontal=True) #hiding flip image fang hiding flip = im.Flip("fang/emotive set/fang hiding.png", horizontal=True) diff --git a/game/script/11.school-assignment-and-route-lock.rpy b/game/script/11.school-assignment-and-route-lock.rpy index 1b4776c..5661f5c 100644 --- a/game/script/11.school-assignment-and-route-lock.rpy +++ b/game/script/11.school-assignment-and-route-lock.rpy @@ -209,9 +209,9 @@ show anonphone at scenter with moveinbottom "Uhhhhhhhhhhhhhh…" -"{i}Anon: No. On an unrelated matter, have you spoken with Naser recently?" +"{i}Anon: No. On an unrelated matter, have you spoken with Naser recently?{/i}" -"{i}Fang: Told him i was staying here yesterday but havent checked his respones{/i}" +"{i}Fang: Told him i was staying here yesterday but havent checked his responses{/i}" "{i}Fang: Why do i need to kill him or something <:V{/i}" diff --git a/game/script/11B.anon-gets-fangs'-pronouns-right,-and-she's-smug-about-it.rpy b/game/script/11B.anon-gets-fangs'-pronouns-right,-and-she's-smug-about-it.rpy index 4ee9bc9..abd30ee 100644 --- a/game/script/11B.anon-gets-fangs'-pronouns-right,-and-she's-smug-about-it.rpy +++ b/game/script/11B.anon-gets-fangs'-pronouns-right,-and-she's-smug-about-it.rpy @@ -54,7 +54,7 @@ Drf "Good, good." Drf "I won’t keep you any longer then." "Fernsworth meanders to pester the next few students." -hide farnsworthflip +hide farnsworth flip show farnsworth hide farnsworth with moveoutleft A "Anyways, where were we?" diff --git a/game/script/12C.anon-fang-lovey-dovey.rpy b/game/script/12C.anon-fang-lovey-dovey.rpy index 43b3423..c780ad4 100644 --- a/game/script/12C.anon-fang-lovey-dovey.rpy +++ b/game/script/12C.anon-fang-lovey-dovey.rpy @@ -199,13 +199,13 @@ with fade "Despite being in a group of four." scene garden with fade -"{i}Stella’s chattering with me about the esoteric while the school delinquents get the Orwellian treatment from Rosa, who swaps between helping Fang plant some kind of exotic flower I don’t know and barking orders." +"{i}Stella’s chattering with me about the esoteric while the school delinquents get the Orwellian treatment from Rosa, who swaps between helping Fang plant some kind of exotic flower I don’t know and barking orders.{/i}" -"{i}I understand maybe a third of what Stella’s saying and mostly just nod along." +"{i}I understand maybe a third of what Stella’s saying and mostly just nod along.{/i}" -St "{i}-nights really important because the moon will be in perfect alignment for my divinations." +St "{i}-nights really important because the moon will be in perfect alignment for my divinations.{/i}" -A "{i}Right, right. Lunar eclipse. Is that the one where you can’t see the Moon or the one where you can’t see the sun?" +A "{i}Right, right. Lunar eclipse. Is that the one where you can’t see the Moon or the one where you can’t see the sun?{/i}" St "{i}*sigh*{/i}" @@ -213,7 +213,7 @@ St "{i}It’s also called a Blood Moon for its color?{/i}" St "{i}It’s a very important night for me, Anon.{/i}" -St "{i}I feel as though my divinations will be at their best under it’s crimson glow." +St "{i}I feel as though my divinations will be at their best under it’s crimson glow.{/i}" A "{i}But camping?{/i}" @@ -281,7 +281,7 @@ F "Who cares if he hasn’t evolved to fire yet?" "I trip into the tent and tear the whole thing down." stop music fadeout 1.0 -play music "audio/OST/Fuck You I Like This Chick.oggs" fadein 1.0 +play music "audio/OST/Fuck You I Like This Chick.ogg" fadein 1.0 "By the time I get both of the tents standing, the sun is nearing the horizon." "My back already hurts from setting everything up." diff --git a/game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy b/game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy index c4d9561..062a634 100644 --- a/game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy +++ b/game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy @@ -690,7 +690,7 @@ Ro "E-eh?" T "Anon, please tell me, is Fang fine?" -A "She {i}was{i\} fine, Trish. Now look what you’ve done." +A "She {i}was{/i} fine, Trish. Now look what you’ve done." A "Where do you think you're going?" @@ -706,7 +706,7 @@ Ro "Let them solve this, I'm sure Lucy's at a point where she can deal with this A "She most definitely is NOT, Rosa." -A "God dammit, why’d you have to pull this stunt {i}today{i\} of all days?" +A "God dammit, why’d you have to pull this stunt {i}today{/i} of all days?" A "Couldn’t you have tried this bullshit any other time?!" diff --git a/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy b/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy index 65f978d..8529dd6 100644 --- a/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy +++ b/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy @@ -2065,7 +2065,7 @@ F "So why…" F "Why doesn’t he hate me…" -Nas "{i}{alpha=0.5}She’s still family.{/i}{/alpha}" +Nas "{i}{alpha=0.5}She’s still family.{/alpha}{/i}" A "Because you’re his sister." diff --git a/game/script/6.anon-helps-fang-find-a-venue-for-band.rpy b/game/script/6.anon-helps-fang-find-a-venue-for-band.rpy index 448ed45..6a40672 100644 --- a/game/script/6.anon-helps-fang-find-a-venue-for-band.rpy +++ b/game/script/6.anon-helps-fang-find-a-venue-for-band.rpy @@ -830,7 +830,7 @@ Nas "{alpha=0.5}{i}...?{/i}{/alpha}" A "{alpha=0.5}{i}...?{/i}{/alpha}" -N "{alpha=0.5}{i}If there’s anything Fang needs in these trying times, it’s a new friend to talk to!" +N "{alpha=0.5}{i}If there’s anything Fang needs in these trying times, it’s a new friend to talk to!{/i}{/alpha}" "This entire time." diff --git a/game/script/7.concert-day.rpy b/game/script/7.concert-day.rpy index 96686c9..69884e1 100644 --- a/game/script/7.concert-day.rpy +++ b/game/script/7.concert-day.rpy @@ -642,6 +642,7 @@ else: "Fang fell out of tempo with Reed’s drums, stumbling over the end of the song." scene dimstage with fade + #TODO: where is dimstage show anon neutral at aright with dissolve "It’s silent." From aebdeaef0f3152b74b29ff6f3c8eb6540a7f1075 Mon Sep 17 00:00:00 2001 From: coolestskinnieinthejungle Date: Wed, 16 Jun 2021 11:49:23 -0500 Subject: [PATCH 2/3] HATE GIT (conflict fix?) --- game/script/7.concert-day.rpy | 1 - 1 file changed, 1 deletion(-) diff --git a/game/script/7.concert-day.rpy b/game/script/7.concert-day.rpy index 69884e1..96686c9 100644 --- a/game/script/7.concert-day.rpy +++ b/game/script/7.concert-day.rpy @@ -642,7 +642,6 @@ else: "Fang fell out of tempo with Reed’s drums, stumbling over the end of the song." scene dimstage with fade - #TODO: where is dimstage show anon neutral at aright with dissolve "It’s silent." From 303de472032764692e54a331a36e0e468c82f252 Mon Sep 17 00:00:00 2001 From: coolestskinnieinthejungle Date: Wed, 16 Jun 2021 11:54:06 -0500 Subject: [PATCH 3/3] stray " kill me --- game/script.rpy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/script.rpy b/game/script.rpy index bdc9cec..a25af00 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -113,7 +113,7 @@ image stellaSilo = im.Flip(im.MatrixColor("stella/stella neutral.png",im.matrix. image rosaSilo = im.MatrixColor("rosa/rosa neutral.png",im.matrix.brightness(-1)) image naomiSilo = im.MatrixColor("naomi/naomi neutral.png",im.matrix.brightness(-1)) image naserSilo = im.Flip(im.MatrixColor("naser/naser neutral.png",im.matrix.brightness(-1)), horizontal=True) -image fangSilo = im.MatrixColor("fang/basic set/fang neutral.png","im.matrix.brightness(-1)) +image fangSilo = im.MatrixColor("fang/basic set/fang neutral.png",im.matrix.brightness(-1)) image fangAngrySilo = im.MatrixColor("fang/basic set/fang angry.png",im.matrix.brightness(-1)) #violence flips