MapAnon/SnootGame
1
Fork 0
forked from Cavemanon/SnootGame
Code Issues Pull Requests Projects Releases Wiki Activity

conflict resolution

Browse Source
This commit is contained in:
stillzero
2021-06-18 21:03:15 -05:00
parent 544640a554 f7c785b5b1
commit 614c29eec1
114 changed files with 28429 additions and 1432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
game/script.rpy
View File

@ -7,9 +7,10 @@
#just like make game
#??????
#Profit&Export
#/usr/bin/touch gf - cannot touch 'gf': Permission denied
#To whoever decides to look at the script file of this, woe be upon ye, because this is an absolute clusterfuck. The actual script for the game starts on line 346. The rest is just boilerplate code for characters, scenes, transitions, and whatnot.
#Why yes all my code is in one massive file called "script" thats 28k lines long, how could you tell?
#To whoever looked at the old script file of this, woe be upon ye, because it was an absolute clusterfuck. story scripts are now in the script directory. everything here is just boilerplate code for characters, scenes, transitions, and whatnot.
#Why yes all my code was formerly in one massive file called "script" thats 28k lines long, how could you tell?
#Licensed under the GNU AGPL v3, for more information check snootgame.xyz or the LICENSE file that should have came with this work.
init python:
@ -115,8 +116,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)
@ -257,7 +258,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)
@ -351,6 +352,7 @@ transform rright:
xalign 1.7 yalign 0.1
label start:
<<<<<<< HEAD
$ fangscore = 0
$ anonscore = 0
$ tradwife = False
@ -28591,3 +28593,10 @@ if tradwife:
scene c10 with fade
pause 20
return
=======
$ fangscore = 0
$ anonscore = 0
$ tradwife = False
pause 1.0
call storyline
>>>>>>> f7c785b5b18283750caccf319c1f9c091647acee