Merge remote-tracking branch 'origin/Monster-Update-6' into nio_mustard
94
.gitignore
vendored
|
@ -22,13 +22,13 @@ traceback.txt
|
||||||
|
|
||||||
#Vim swap files
|
#Vim swap files
|
||||||
.sw?
|
.sw?
|
||||||
|
|
||||||
*~
|
*~
|
||||||
*.bak
|
*.bak
|
||||||
|
|
||||||
#cache files
|
#save files & cache files
|
||||||
#save files
|
|
||||||
/game/saves/
|
/game/saves/
|
||||||
|
/game/saves/*
|
||||||
|
/game/cache/*
|
||||||
/game/cache
|
/game/cache
|
||||||
saves
|
saves
|
||||||
tmp
|
tmp
|
||||||
|
@ -42,85 +42,15 @@ env
|
||||||
*.pyc
|
*.pyc
|
||||||
*.pyo
|
*.pyo
|
||||||
|
|
||||||
styles.txt
|
#Vim (best text editor) swap files
|
||||||
|
.sw?
|
||||||
|
|
||||||
/gui/game/gui
|
#binary files
|
||||||
/game/saves
|
*.rpyc
|
||||||
|
*.rpymc
|
||||||
|
|
||||||
/android
|
#backups
|
||||||
/build
|
*.bak
|
||||||
/dist
|
|
||||||
/dists
|
|
||||||
/renpy.app
|
|
||||||
/jedit
|
|
||||||
/lint.txt
|
|
||||||
/renpy.code
|
|
||||||
/*testing*
|
|
||||||
/screenshot*
|
|
||||||
/renpy.exe
|
|
||||||
/renpy-32.exe
|
|
||||||
/renpy.sh
|
|
||||||
/lib
|
|
||||||
/lib.old
|
|
||||||
/lib2
|
|
||||||
/lib3
|
|
||||||
/doc
|
|
||||||
/.pydevproject
|
|
||||||
/.pydevproject.bak
|
|
||||||
/.project
|
|
||||||
/.cproject
|
|
||||||
/.settings
|
|
||||||
/LICENSE.txt
|
|
||||||
/templates/english/README.html
|
|
||||||
/the_question/README.html
|
|
||||||
/tutorial/README.html
|
|
||||||
/renpy/angle/*.pyx
|
|
||||||
/renpy/angle/*.pxd
|
|
||||||
/renpy-ppc.zip
|
|
||||||
/module/build
|
|
||||||
/module/gen*
|
|
||||||
/editra
|
|
||||||
/atom
|
|
||||||
/launcher/game/theme
|
|
||||||
/launcher/game/script_version.rpy
|
|
||||||
|
|
||||||
/dl
|
#android
|
||||||
renpy/vc_version.py
|
.android.json
|
||||||
.externalToolBuilders
|
|
||||||
/rapt
|
|
||||||
/evil
|
|
||||||
/iaptest
|
|
||||||
/pygame_sdl2
|
|
||||||
/renios
|
|
||||||
/steam_appid.txt
|
|
||||||
/.coverage
|
|
||||||
/id
|
|
||||||
/ai
|
|
||||||
/interface_7
|
|
||||||
/htmlcov
|
|
||||||
/the_question*/.android.json
|
|
||||||
/WINDOWS.rst
|
|
||||||
/old
|
|
||||||
|
|
||||||
/*-all/
|
|
||||||
/*-win/
|
|
||||||
/*-mac/
|
|
||||||
/*-linux*/
|
|
||||||
/*-dists/
|
|
||||||
doc-web
|
|
||||||
|
|
||||||
sphinx/source/inc
|
|
||||||
sphinx/source/thequestion.rst
|
|
||||||
tutorial/game/tutorial_director.rpy
|
|
||||||
launcher/theme
|
|
||||||
module/emscripten-static/
|
|
||||||
web/
|
|
||||||
|
|
||||||
cubism
|
|
||||||
glexperiment
|
|
||||||
live2d
|
|
||||||
rapt2
|
|
||||||
rapt3
|
|
||||||
renios2
|
|
||||||
renios3
|
|
||||||
notarized
|
|
||||||
|
|
|
@ -78,7 +78,8 @@ define gui.text_size = 42
|
||||||
|
|
||||||
## The size of character names.
|
## The size of character names.
|
||||||
define gui.name_text_size = 45
|
define gui.name_text_size = 45
|
||||||
define gui.name_text_outlines = [ (absolute(1.5), gui.name_outline, 0, 0) ]
|
define gui.name_text_thickness = absolute(2.0)
|
||||||
|
define gui.name_text_outlines = [ (gui.name_text_thickness, gui.name_outline, 0, 0) ]
|
||||||
|
|
||||||
## The size of text in the game's user interface.
|
## The size of text in the game's user interface.
|
||||||
define gui.interface_text_size = 33
|
define gui.interface_text_size = 33
|
||||||
|
|
Before Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 27 KiB |
Before Width: | Height: | Size: 27 KiB |
Before Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 9.9 KiB |
Before Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 9.9 KiB |
Before Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 27 KiB |
Before Width: | Height: | Size: 27 KiB |
Before Width: | Height: | Size: 16 KiB |
Before Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 28 KiB |
Before Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 5.4 KiB |
Before Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 5.4 KiB |
Before Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 5.4 KiB |
Before Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 425 KiB |
Before Width: | Height: | Size: 549 KiB |
Before Width: | Height: | Size: 210 KiB |
Before Width: | Height: | Size: 226 KiB |
Before Width: | Height: | Size: 246 KiB |
Before Width: | Height: | Size: 204 KiB |
Before Width: | Height: | Size: 167 KiB |
Before Width: | Height: | Size: 183 KiB |
Before Width: | Height: | Size: 198 KiB |
Before Width: | Height: | Size: 199 KiB |
Before Width: | Height: | Size: 266 KiB |
Before Width: | Height: | Size: 214 KiB |
|
@ -8,4 +8,32 @@ label chapter_2_new:
|
||||||
play music 'audio/OST/Those Other Two Weirdos.ogg'
|
play music 'audio/OST/Those Other Two Weirdos.ogg'
|
||||||
show anon neutral flip at aright with dissolve
|
show anon neutral flip at aright with dissolve
|
||||||
A "Sample Text"
|
A "Sample Text"
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
F "Sample Text"
|
||||||
|
Lucy "Sample Text"
|
||||||
|
Ro "Sample Text"
|
||||||
|
St "Sample Text"
|
||||||
|
N "Sample Text"
|
||||||
|
Nas "Sample Text"
|
||||||
|
T "Sample Text"
|
||||||
|
Attendant "Sample Text"
|
||||||
|
Sp "Sample Text"
|
||||||
|
Re "Sample Text"
|
||||||
|
D "Sample Text"
|
||||||
|
FM "Sample Text"
|
||||||
|
FD "Sample Text"
|
||||||
|
Tsuki "Sample Text"
|
||||||
|
unknown "Sample Text"
|
||||||
|
jingo "Sample Text"
|
||||||
|
MaitD "Sample Text"
|
||||||
|
Moe "Sample Text"
|
||||||
|
Vince "Sample Text"
|
||||||
|
Waitress "Sample Text"
|
||||||
|
AnonAndFang "Sample Text"
|
||||||
|
SV "Sample Text"
|
||||||
|
carl "Sample Text"
|
||||||
|
Drf "Sample Text"
|
||||||
|
FRT "Sample Text"
|
||||||
|
>>>>>>> origin/Monster-Update-6
|
||||||
return
|
return
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
###Updater Python stuff###
|
###Updater Python stuff###
|
||||||
init python:
|
init python:
|
||||||
if renpy.variant("pc"): #Don't run this on mobile, not supported
|
if renpy.variant("pc"): #Don't run this on mobile, not supported
|
||||||
if persistent.updateresult is None:
|
if persistent.updateresult is None:
|
||||||
|
@ -39,6 +39,27 @@ init python:
|
||||||
# renpy.play("audio/ui/uiOptionOn.wav")
|
# renpy.play("audio/ui/uiOptionOn.wav")
|
||||||
# preferences.all_mute = not preferences.all_mute
|
# preferences.all_mute = not preferences.all_mute
|
||||||
|
|
||||||
|
=======
|
||||||
|
if renpy.variant("pc"): #Don't run this on mobile, not supported
|
||||||
|
if persistent.updateresult is None:
|
||||||
|
persistent.updateresult = "No new version is available"
|
||||||
|
if persistent.autoup is None:
|
||||||
|
persistent.autoup = False
|
||||||
|
if persistent.updateWebServer is None:
|
||||||
|
persistent.updateWebServer = "http://updates.snootgame.xyz/updates.json"
|
||||||
|
|
||||||
|
def UpdateCheck():
|
||||||
|
# WHY YES I ONLY ALLOW PEOPLE USING MY FRAMEWORK TO CHECK FOR AN UPDATE EVERY SIX FUCKING HOURS HOW DID YOU KNOW
|
||||||
|
# NOPE check_interval=5 (5 SECONDS) FUCK YOU
|
||||||
|
pendingVersion = updater.UpdateVersion(persistent.updateWebServer, check_interval=5)
|
||||||
|
if pendingVersion == None or pendingVersion == config.version or "TEST" in pendingVersion:
|
||||||
|
persistent.updateresult = "No new version is available"
|
||||||
|
else:
|
||||||
|
persistent.updateresult = pendingVersion
|
||||||
|
|
||||||
|
def ToggleAutoUpdate():
|
||||||
|
persistent.autoup = not persistent.autoup
|
||||||
|
>>>>>>> origin/Monster-Update-6
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
## Initialization
|
## Initialization
|
||||||
|
@ -707,6 +728,7 @@ screen updates():
|
||||||
|
|
||||||
label _("Update Checker:")
|
label _("Update Checker:")
|
||||||
label _("{color=#FFFFFF}{size=32}[persistent.updateresult!t]{/size}{/color}")
|
label _("{color=#FFFFFF}{size=32}[persistent.updateresult!t]{/size}{/color}")
|
||||||
|
|
||||||
textbutton _("{size=36}Check for Update\n{/size}") activate_sound "audio/ui/uiClick.wav" action [Notify("Checking for update..."), Function(UpdateCheck)]
|
textbutton _("{size=36}Check for Update\n{/size}") activate_sound "audio/ui/uiClick.wav" action [Notify("Checking for update..."), Function(UpdateCheck)]
|
||||||
|
|
||||||
label _("Updater:")
|
label _("Updater:")
|
||||||
|
|
|
@ -32,6 +32,7 @@ init python:
|
||||||
if persistent.scroll == True:
|
if persistent.scroll == True:
|
||||||
config.keymap['dismiss'].append('mousedown_4')
|
config.keymap['dismiss'].append('mousedown_4')
|
||||||
|
|
||||||
|
|
||||||
transform randPosition:
|
transform randPosition:
|
||||||
alpha 0.0
|
alpha 0.0
|
||||||
xalign random.uniform(0.2,0.8)
|
xalign random.uniform(0.2,0.8)
|
||||||
|
@ -88,33 +89,33 @@ transform randPosition:
|
||||||
|
|
||||||
|
|
||||||
#Characters
|
#Characters
|
||||||
define A = Character ('Anon',color="#36E12D", who_outlines=[(1, '#0C300A')]) # Light Green
|
define A = Character ('Anon',color="#36E12D", who_outlines=[(gui.name_text_thickness, '#0C300A')]) # Light Green
|
||||||
define F = Character ('Fang',color="#B4D4CE", who_outlines=[(1, '#112D27')]) # Light Cyan
|
define F = Character ('Fang',color="#B4D4CE", who_outlines=[(gui.name_text_thickness, '#0F3930')]) # Light Cyan
|
||||||
define Lucy = Character ('Lucy',color="#B4D4CE", who_outlines=[(1, '#112D27')]) # Light Cyan
|
define Lucy = Character ('Lucy',color="#B4D4CE", who_outlines=[(gui.name_text_thickness, '#0F3930')]) # Light Cyan
|
||||||
define Ro = Character ('Rosa',color="#FE712B", who_outlines=[(1, '#3D1809')]) # Red-Orange
|
define Ro = Character ('Rosa',color="#FE712B", who_outlines=[(gui.name_text_thickness, '#54230F')]) # Red-Orange
|
||||||
define St = Character ('Stella',color="#D2FFAA", who_outlines=[(1, '#203011')]) # Light Green
|
define St = Character ('Stella',color="#D5FFAE", who_outlines=[(gui.name_text_thickness, '#294211')]) # Light Green
|
||||||
define N = Character ('Naomi',color="#F8B9A0", who_outlines=[(1, '#291A1B')]) # Peach
|
define N = Character ('Naomi',color="#FDD2C1", who_outlines=[(gui.name_text_thickness, '#462628')]) # Peach
|
||||||
define Nas = Character ('Naser',color="#F89E38", who_outlines=[(1, '#2D2D2D')]) # Orange
|
define Nas = Character ('Naser',color="#FFB561", who_outlines=[(gui.name_text_thickness, '#512322')]) # Orange
|
||||||
define T = Character ('Trish',color="#B675E6", who_outlines=[(1, '#1F0632')]) # Purple
|
define T = Character ('Trish',color="#B675E6", who_outlines=[(gui.name_text_thickness, '#3A0C5D')]) # Purple
|
||||||
define Attendant = Character ('Attendant',color="#8A0036", who_outlines=[(1, '#FFFFFF')]) # Maroon
|
define Attendant = Character ('Attendant',color="#5BF0F8", who_outlines=[(gui.name_text_thickness, '#121C68')]) # Aqua
|
||||||
define Sp = Character ('Spears',color="#C4C3C3", who_outlines=[(1, '#272727')]) # Light Grey
|
define Sp = Character ('Spears',color="#C7C7C7", who_outlines=[(gui.name_text_thickness, '#272727')]) # Light Grey
|
||||||
define Re = Character ('Reed',color="#ED4C5B", who_outlines=[(1, '#361013')]) # Bright Red
|
define Re = Character ('Reed',color="#ED4C5B", who_outlines=[(gui.name_text_thickness, '#421014')]) # Bright Red
|
||||||
define D = Character ('Driver',color="#FFC63A", who_outlines=[(1, '#4D280A')]) # Yellow-Orange
|
define D = Character ('Driver',color="#FFECBC", who_outlines=[(gui.name_text_thickness, '#563010')]) # Yellow-Orange
|
||||||
define FM = Character ('Fangs Mom',color="#FFD8F6", who_outlines=[(1, '#361730')]) # Bright Pink
|
define FM = Character ("Fang's Mom",color="#FFD8F6", who_outlines=[(gui.name_text_thickness, '#521947')]) # Bright Pink
|
||||||
define FD = Character ('Fangs Dad',color="#D8A09A", who_outlines=[(1, '#190E0F')]) # Desaturated Orange
|
define FD = Character ("Fang's Dad",color="#D8A09A", who_outlines=[(gui.name_text_thickness, '#461B1F')]) # Desaturated Orange
|
||||||
define Tsuki = Character ('Mr. Tsuki',color="#A7F2A2", who_outlines=[(1, '#320E3B')]) # Pear Green
|
define Tsuki = Character ('Mr. Tsuki',color="#A7F2A2", who_outlines=[(gui.name_text_thickness, '#471054')]) # Pear Green
|
||||||
define unknown = Character ('(???)',color="#000000", who_outlines=[(1, '#FFFFFF')]) # Black
|
define unknown = Character ('(???)',color="#FFF", who_outlines=[(gui.name_text_thickness, '#000')]) # White
|
||||||
define jingo = Character ('Mr. Jingo',color="#CD8283", who_outlines=[(1, '#0F0D49')]) # Desaturated Red
|
define jingo = Character ('Mr. Jingo',color="#CD8283", who_outlines=[(gui.name_text_thickness, '#0F0D49')]) # Desaturated Red
|
||||||
define MaitD = Character ('Maitre D',color="#241630", who_outlines=[(1, '#241630')]) # Cobalt Blue
|
define MaitD = Character ('Maitre D',color="#AF9EFF", who_outlines=[(gui.name_text_thickness, '#241630')]) # Cobalt Blue
|
||||||
define Moe = Character('Moe',color="#A5BEED", who_outlines=[(1, '#342210')]) # Desaturated Blue
|
define Moe = Character('Moe',color="#A5BEED", who_outlines=[(gui.name_text_thickness, '#1F253B')]) # Desaturated Blue
|
||||||
define Vince = Character ('Vince',color="#FFC63A", who_outlines=[(1, '#4D280A')]) # Yellow-Orange
|
define Vince = Character ('Vince',color="#FFECBC", who_outlines=[(gui.name_text_thickness, '#563010')]) # Yellow-Orange
|
||||||
define Waitress = Character ('Waitress',color="#F691C8", who_outlines=[(1, '#402E3A')]) # Pink
|
define Waitress = Character ('Waitress',color="#F691C8", who_outlines=[(gui.name_text_thickness, '#512040')]) # Pink
|
||||||
#long TB chars
|
#long TB chars
|
||||||
define AnonAndFang = Character('Anon and Fang',color="72DFA8", who_outlines=[(1, '#113623')])
|
define AnonAndFang = Character('Anon and Fang',color="72DFA8", who_outlines=[(gui.name_text_thickness, '#113623')]) # Cyan
|
||||||
define SV = Character ('Street Vendor',color="#F8E120", who_outlines=[(1, '#361504')])
|
define SV = Character ('Street Vendor',color="#F8E120", who_outlines=[(gui.name_text_thickness, '#58260C')]) # Yellow
|
||||||
define carl = Character ('Mr. Carldewskii',color="#E19E40", who_outlines=[(1, '#03223B')])
|
define carl = Character ('Mr. Carldewskii',color="#EECB99", who_outlines=[(gui.name_text_thickness, '#082337')]) #Puke Orange
|
||||||
define Drf = Character ('Dr. Fernsworth',color="#253354", who_outlines=[(1, '#334573')])
|
define Drf = Character ('Dr. Fernsworth',color="#DCEEF5", who_outlines=[(gui.name_text_thickness, '#253354')]) #Yellow-Orange
|
||||||
define FRT = Character ('Fang Reed & Trish',color="#4963A5", who_outlines=[(1, '#FFFFFF')])
|
define FRT = Character ('Fang Reed & Trish',color="#DCBBF7", who_outlines=[(gui.name_text_thickness, '#191C78')]) #Light Purple
|
||||||
|
|
||||||
#Extra image translations
|
#Extra image translations
|
||||||
#siloettes
|
#siloettes
|
||||||
|
|
|
@ -10,10 +10,13 @@ screen mod_menu_button(filename, label, function):
|
||||||
xmaximum 600
|
xmaximum 600
|
||||||
ymaximum 129
|
ymaximum 129
|
||||||
action function
|
action function
|
||||||
|
<<<<<<< HEAD
|
||||||
if 'Back' in label or 'Return' in label or 'Quit' in label or 'Main Menu' in label:
|
if 'Back' in label or 'Return' in label or 'Quit' in label or 'Main Menu' in label:
|
||||||
activate_sound "audio/ui/uiBack.wav"
|
activate_sound "audio/ui/uiBack.wav"
|
||||||
else:
|
else:
|
||||||
activate_sound "audio/ui/uiClick.wav"
|
activate_sound "audio/ui/uiClick.wav"
|
||||||
|
=======
|
||||||
|
>>>>>>> origin/Monster-Update-6
|
||||||
fixed:
|
fixed:
|
||||||
add filename xalign 0.5 yalign 0.5 zoom 0.9
|
add filename xalign 0.5 yalign 0.5 zoom 0.9
|
||||||
text label xalign 0.5 yalign 0.5 xanchor 0.5 size 34
|
text label xalign 0.5 yalign 0.5 xanchor 0.5 size 34
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
{"android_build": "Release", "renamed_all": true, "renamed_steam": true, "force_recompile": false, "build_update": false, "packages": ["mac", "linux", "win"], "add_from": true}
|
|