diff --git a/.gitignore b/.gitignore index 66ed73c..7d85155 100644 --- a/.gitignore +++ b/.gitignore @@ -22,13 +22,13 @@ traceback.txt #Vim swap files .sw? - *~ *.bak -#cache files -#save files +#save files & cache files /game/saves/ +/game/saves/* +/game/cache/* /game/cache saves tmp @@ -42,85 +42,15 @@ env *.pyc *.pyo -styles.txt +#Vim (best text editor) swap files +.sw? -/gui/game/gui -/game/saves +#binary files +*.rpyc +*.rpymc -/android -/build -/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 +#backups +*.bak -/dl -renpy/vc_version.py -.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 +#android +.android.json diff --git a/game/gui.rpy b/game/gui.rpy index d8a3daf..78fcfe1 100644 --- a/game/gui.rpy +++ b/game/gui.rpy @@ -78,7 +78,8 @@ define gui.text_size = 42 ## The size of character names. 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. define gui.interface_text_size = 33 diff --git a/game/gui/button/menubuttons/aboutbutton_idle.png b/game/gui/button/menubuttons/aboutbutton_idle.png deleted file mode 100644 index 6f1a5e8..0000000 Binary files a/game/gui/button/menubuttons/aboutbutton_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/aboutbutton_selected_hover.png b/game/gui/button/menubuttons/aboutbutton_selected_hover.png deleted file mode 100644 index 7a63cb1..0000000 Binary files a/game/gui/button/menubuttons/aboutbutton_selected_hover.png and /dev/null differ diff --git a/game/gui/button/menubuttons/aboutbutton_selected_idle.png b/game/gui/button/menubuttons/aboutbutton_selected_idle.png deleted file mode 100644 index 7a63cb1..0000000 Binary files a/game/gui/button/menubuttons/aboutbutton_selected_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/extrasbutton.png b/game/gui/button/menubuttons/extrasbutton.png deleted file mode 100644 index 661e0cd..0000000 Binary files a/game/gui/button/menubuttons/extrasbutton.png and /dev/null differ diff --git a/game/gui/button/menubuttons/extrasbutton_idle.png b/game/gui/button/menubuttons/extrasbutton_idle.png deleted file mode 100644 index 661e0cd..0000000 Binary files a/game/gui/button/menubuttons/extrasbutton_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/extrasbutton_selected_hover.png b/game/gui/button/menubuttons/extrasbutton_selected_hover.png deleted file mode 100644 index 90c3716..0000000 Binary files a/game/gui/button/menubuttons/extrasbutton_selected_hover.png and /dev/null differ diff --git a/game/gui/button/menubuttons/extrasbutton_selected_idle.png b/game/gui/button/menubuttons/extrasbutton_selected_idle.png deleted file mode 100644 index 90c3716..0000000 Binary files a/game/gui/button/menubuttons/extrasbutton_selected_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/gallerybutton.png b/game/gui/button/menubuttons/gallerybutton.png deleted file mode 100644 index 62ec66f..0000000 Binary files a/game/gui/button/menubuttons/gallerybutton.png and /dev/null differ diff --git a/game/gui/button/menubuttons/gallerybutton_idle.png b/game/gui/button/menubuttons/gallerybutton_idle.png deleted file mode 100644 index 62ec66f..0000000 Binary files a/game/gui/button/menubuttons/gallerybutton_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/gallerybutton_selected_hover.png b/game/gui/button/menubuttons/gallerybutton_selected_hover.png deleted file mode 100644 index e3a9fea..0000000 Binary files a/game/gui/button/menubuttons/gallerybutton_selected_hover.png and /dev/null differ diff --git a/game/gui/button/menubuttons/gallerybutton_selected_idle.png b/game/gui/button/menubuttons/gallerybutton_selected_idle.png deleted file mode 100644 index e3a9fea..0000000 Binary files a/game/gui/button/menubuttons/gallerybutton_selected_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/helpbutton.png b/game/gui/button/menubuttons/helpbutton.png deleted file mode 100644 index 0d5b1d7..0000000 Binary files a/game/gui/button/menubuttons/helpbutton.png and /dev/null differ diff --git a/game/gui/button/menubuttons/helpbutton_idle.png b/game/gui/button/menubuttons/helpbutton_idle.png deleted file mode 100644 index 6d994cb..0000000 Binary files a/game/gui/button/menubuttons/helpbutton_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/helpbutton_selected_hover.png b/game/gui/button/menubuttons/helpbutton_selected_hover.png deleted file mode 100644 index db2dbf4..0000000 Binary files a/game/gui/button/menubuttons/helpbutton_selected_hover.png and /dev/null differ diff --git a/game/gui/button/menubuttons/helpbutton_selected_idle.png b/game/gui/button/menubuttons/helpbutton_selected_idle.png deleted file mode 100644 index db2dbf4..0000000 Binary files a/game/gui/button/menubuttons/helpbutton_selected_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/loadbutton_idle.png b/game/gui/button/menubuttons/loadbutton_idle.png deleted file mode 100644 index 1a9ee6e..0000000 Binary files a/game/gui/button/menubuttons/loadbutton_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/loadbutton_selected_hover.png b/game/gui/button/menubuttons/loadbutton_selected_hover.png deleted file mode 100644 index c2f6d7b..0000000 Binary files a/game/gui/button/menubuttons/loadbutton_selected_hover.png and /dev/null differ diff --git a/game/gui/button/menubuttons/loadbutton_selected_idle.png b/game/gui/button/menubuttons/loadbutton_selected_idle.png deleted file mode 100644 index c2f6d7b..0000000 Binary files a/game/gui/button/menubuttons/loadbutton_selected_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/optionsbutton_idle.png b/game/gui/button/menubuttons/optionsbutton_idle.png deleted file mode 100644 index 977750c..0000000 Binary files a/game/gui/button/menubuttons/optionsbutton_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/optionsbutton_selected_hover.png b/game/gui/button/menubuttons/optionsbutton_selected_hover.png deleted file mode 100644 index dd8db16..0000000 Binary files a/game/gui/button/menubuttons/optionsbutton_selected_hover.png and /dev/null differ diff --git a/game/gui/button/menubuttons/optionsbutton_selected_idle.png b/game/gui/button/menubuttons/optionsbutton_selected_idle.png deleted file mode 100644 index dd8db16..0000000 Binary files a/game/gui/button/menubuttons/optionsbutton_selected_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/quitbutton_idle.png b/game/gui/button/menubuttons/quitbutton_idle.png deleted file mode 100644 index d3fe89f..0000000 Binary files a/game/gui/button/menubuttons/quitbutton_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/quitbutton_selected_hover.png b/game/gui/button/menubuttons/quitbutton_selected_hover.png deleted file mode 100644 index 3b89f6a..0000000 Binary files a/game/gui/button/menubuttons/quitbutton_selected_hover.png and /dev/null differ diff --git a/game/gui/button/menubuttons/quitbutton_selected_idle.png b/game/gui/button/menubuttons/quitbutton_selected_idle.png deleted file mode 100644 index 3b89f6a..0000000 Binary files a/game/gui/button/menubuttons/quitbutton_selected_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/returnbutton_idle.png b/game/gui/button/menubuttons/returnbutton_idle.png deleted file mode 100644 index 3db0bdc..0000000 Binary files a/game/gui/button/menubuttons/returnbutton_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/startbutton_idle.png b/game/gui/button/menubuttons/startbutton_idle.png deleted file mode 100644 index c4fb96e..0000000 Binary files a/game/gui/button/menubuttons/startbutton_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/startbutton_selected_hover.png b/game/gui/button/menubuttons/startbutton_selected_hover.png deleted file mode 100644 index 1848949..0000000 Binary files a/game/gui/button/menubuttons/startbutton_selected_hover.png and /dev/null differ diff --git a/game/gui/button/menubuttons/startbutton_selected_idle.png b/game/gui/button/menubuttons/startbutton_selected_idle.png deleted file mode 100644 index 1848949..0000000 Binary files a/game/gui/button/menubuttons/startbutton_selected_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/updatesbutton_idle.png b/game/gui/button/menubuttons/updatesbutton_idle.png deleted file mode 100644 index 185961a..0000000 Binary files a/game/gui/button/menubuttons/updatesbutton_idle.png and /dev/null differ diff --git a/game/gui/button/menubuttons/updatesbutton_selected_hover.png b/game/gui/button/menubuttons/updatesbutton_selected_hover.png deleted file mode 100644 index 15c4ce8..0000000 Binary files a/game/gui/button/menubuttons/updatesbutton_selected_hover.png and /dev/null differ diff --git a/game/gui/button/menubuttons/updatesbutton_selected_idle.png b/game/gui/button/menubuttons/updatesbutton_selected_idle.png deleted file mode 100644 index 15c4ce8..0000000 Binary files a/game/gui/button/menubuttons/updatesbutton_selected_idle.png and /dev/null differ diff --git a/game/gui/button/uioptionbuttons/auto_hover.png b/game/gui/button/uioptionbuttons/auto_hover.png deleted file mode 100644 index e350a73..0000000 Binary files a/game/gui/button/uioptionbuttons/auto_hover.png and /dev/null differ diff --git a/game/gui/button/uioptionbuttons/auto_idle.png b/game/gui/button/uioptionbuttons/auto_idle.png deleted file mode 100644 index 2cce9a8..0000000 Binary files a/game/gui/button/uioptionbuttons/auto_idle.png and /dev/null differ diff --git a/game/gui/button/uioptionbuttons/load_hover.png b/game/gui/button/uioptionbuttons/load_hover.png deleted file mode 100644 index 2aafd23..0000000 Binary files a/game/gui/button/uioptionbuttons/load_hover.png and /dev/null differ diff --git a/game/gui/button/uioptionbuttons/load_idle.png b/game/gui/button/uioptionbuttons/load_idle.png deleted file mode 100644 index cede8e2..0000000 Binary files a/game/gui/button/uioptionbuttons/load_idle.png and /dev/null differ diff --git a/game/gui/button/uioptionbuttons/save_hover.png b/game/gui/button/uioptionbuttons/save_hover.png deleted file mode 100644 index 08b5171..0000000 Binary files a/game/gui/button/uioptionbuttons/save_hover.png and /dev/null differ diff --git a/game/gui/button/uioptionbuttons/save_idle.png b/game/gui/button/uioptionbuttons/save_idle.png deleted file mode 100644 index ad75b70..0000000 Binary files a/game/gui/button/uioptionbuttons/save_idle.png and /dev/null differ diff --git a/game/gui/button/uioptionbuttons/skip_hover.png b/game/gui/button/uioptionbuttons/skip_hover.png deleted file mode 100644 index 1597233..0000000 Binary files a/game/gui/button/uioptionbuttons/skip_hover.png and /dev/null differ diff --git a/game/gui/button/uioptionbuttons/skip_idle.png b/game/gui/button/uioptionbuttons/skip_idle.png deleted file mode 100644 index ccee409..0000000 Binary files a/game/gui/button/uioptionbuttons/skip_idle.png and /dev/null differ diff --git a/game/images/animations/fangtail.webm b/game/images/animations/fangtail.webm deleted file mode 100644 index cdcbeb7..0000000 Binary files a/game/images/animations/fangtail.webm and /dev/null differ diff --git a/game/images/cgs/d04.jpg b/game/images/cgs/d04.jpg deleted file mode 100644 index adb0363..0000000 Binary files a/game/images/cgs/d04.jpg and /dev/null differ diff --git a/game/images/cgs/d04a.jpg b/game/images/cgs/d04a.jpg deleted file mode 100644 index 7a90ef4..0000000 Binary files a/game/images/cgs/d04a.jpg and /dev/null differ diff --git a/game/images/cgs/fangfuneral2.jpg b/game/images/cgs/fangfuneral2.jpg deleted file mode 100644 index 3da4f87..0000000 Binary files a/game/images/cgs/fangfuneral2.jpg and /dev/null differ diff --git a/game/images/cgs/wounds1.jpg b/game/images/cgs/wounds1.jpg deleted file mode 100644 index 824ce53..0000000 Binary files a/game/images/cgs/wounds1.jpg and /dev/null differ diff --git a/game/images/cgs/wounds2.jpg b/game/images/cgs/wounds2.jpg deleted file mode 100644 index 1a9e035..0000000 Binary files a/game/images/cgs/wounds2.jpg and /dev/null differ diff --git a/game/images/cgs/wounds3.jpg b/game/images/cgs/wounds3.jpg deleted file mode 100644 index 008514e..0000000 Binary files a/game/images/cgs/wounds3.jpg and /dev/null differ diff --git a/game/images/cgs/wounds4.jpg b/game/images/cgs/wounds4.jpg deleted file mode 100644 index 056a3b1..0000000 Binary files a/game/images/cgs/wounds4.jpg and /dev/null differ diff --git a/game/images/cgs/wounds5.jpg b/game/images/cgs/wounds5.jpg deleted file mode 100644 index ceab38d..0000000 Binary files a/game/images/cgs/wounds5.jpg and /dev/null differ diff --git a/game/images/cgs/wounds6.jpg b/game/images/cgs/wounds6.jpg deleted file mode 100644 index 262512c..0000000 Binary files a/game/images/cgs/wounds6.jpg and /dev/null differ diff --git a/game/images/cgs/wounds7.jpg b/game/images/cgs/wounds7.jpg deleted file mode 100644 index 99a1b4c..0000000 Binary files a/game/images/cgs/wounds7.jpg and /dev/null differ diff --git a/game/images/cgs/wounds8.jpg b/game/images/cgs/wounds8.jpg deleted file mode 100644 index d417d07..0000000 Binary files a/game/images/cgs/wounds8.jpg and /dev/null differ diff --git a/game/images/cgs/wounds9.jpg b/game/images/cgs/wounds9.jpg deleted file mode 100644 index 9891c66..0000000 Binary files a/game/images/cgs/wounds9.jpg and /dev/null differ diff --git a/game/mods_example/template/chapter2_redo.rpy b/game/mods_example/template/chapter2_redo.rpy index a5a1b71..e2c6d3c 100644 --- a/game/mods_example/template/chapter2_redo.rpy +++ b/game/mods_example/template/chapter2_redo.rpy @@ -8,4 +8,32 @@ label chapter_2_new: play music 'audio/OST/Those Other Two Weirdos.ogg' show anon neutral flip at aright with dissolve 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 diff --git a/game/screens.rpy b/game/screens.rpy index 0953cd2..148334b 100644 --- a/game/screens.rpy +++ b/game/screens.rpy @@ -1,4 +1,4 @@ -###Updater Python stuff### +###Updater Python stuff### init python: if renpy.variant("pc"): #Don't run this on mobile, not supported if persistent.updateresult is None: @@ -39,6 +39,27 @@ init python: # renpy.play("audio/ui/uiOptionOn.wav") # 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 @@ -707,6 +728,7 @@ screen updates(): label _("Update Checker:") 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)] label _("Updater:") diff --git a/game/script.rpy b/game/script.rpy index 48bb42f..6db6302 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -32,6 +32,7 @@ init python: if persistent.scroll == True: config.keymap['dismiss'].append('mousedown_4') + transform randPosition: alpha 0.0 xalign random.uniform(0.2,0.8) @@ -88,33 +89,33 @@ transform randPosition: #Characters -define A = Character ('Anon',color="#36E12D", who_outlines=[(1, '#0C300A')]) # Light Green -define F = Character ('Fang',color="#B4D4CE", who_outlines=[(1, '#112D27')]) # Light Cyan -define Lucy = Character ('Lucy',color="#B4D4CE", who_outlines=[(1, '#112D27')]) # Light Cyan -define Ro = Character ('Rosa',color="#FE712B", who_outlines=[(1, '#3D1809')]) # Red-Orange -define St = Character ('Stella',color="#D2FFAA", who_outlines=[(1, '#203011')]) # Light Green -define N = Character ('Naomi',color="#F8B9A0", who_outlines=[(1, '#291A1B')]) # Peach -define Nas = Character ('Naser',color="#F89E38", who_outlines=[(1, '#2D2D2D')]) # Orange -define T = Character ('Trish',color="#B675E6", who_outlines=[(1, '#1F0632')]) # Purple -define Attendant = Character ('Attendant',color="#8A0036", who_outlines=[(1, '#FFFFFF')]) # Maroon -define Sp = Character ('Spears',color="#C4C3C3", who_outlines=[(1, '#272727')]) # Light Grey -define Re = Character ('Reed',color="#ED4C5B", who_outlines=[(1, '#361013')]) # Bright Red -define D = Character ('Driver',color="#FFC63A", who_outlines=[(1, '#4D280A')]) # Yellow-Orange -define FM = Character ('Fangs Mom',color="#FFD8F6", who_outlines=[(1, '#361730')]) # Bright Pink -define FD = Character ('Fangs Dad',color="#D8A09A", who_outlines=[(1, '#190E0F')]) # Desaturated Orange -define Tsuki = Character ('Mr. Tsuki',color="#A7F2A2", who_outlines=[(1, '#320E3B')]) # Pear Green -define unknown = Character ('(???)',color="#000000", who_outlines=[(1, '#FFFFFF')]) # Black -define jingo = Character ('Mr. Jingo',color="#CD8283", who_outlines=[(1, '#0F0D49')]) # Desaturated Red -define MaitD = Character ('Maitre D',color="#241630", who_outlines=[(1, '#241630')]) # Cobalt Blue -define Moe = Character('Moe',color="#A5BEED", who_outlines=[(1, '#342210')]) # Desaturated Blue -define Vince = Character ('Vince',color="#FFC63A", who_outlines=[(1, '#4D280A')]) # Yellow-Orange -define Waitress = Character ('Waitress',color="#F691C8", who_outlines=[(1, '#402E3A')]) # Pink +define A = Character ('Anon',color="#36E12D", who_outlines=[(gui.name_text_thickness, '#0C300A')]) # Light Green +define F = Character ('Fang',color="#B4D4CE", who_outlines=[(gui.name_text_thickness, '#0F3930')]) # 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=[(gui.name_text_thickness, '#54230F')]) # Red-Orange +define St = Character ('Stella',color="#D5FFAE", who_outlines=[(gui.name_text_thickness, '#294211')]) # Light Green +define N = Character ('Naomi',color="#FDD2C1", who_outlines=[(gui.name_text_thickness, '#462628')]) # Peach +define Nas = Character ('Naser',color="#FFB561", who_outlines=[(gui.name_text_thickness, '#512322')]) # Orange +define T = Character ('Trish',color="#B675E6", who_outlines=[(gui.name_text_thickness, '#3A0C5D')]) # Purple +define Attendant = Character ('Attendant',color="#5BF0F8", who_outlines=[(gui.name_text_thickness, '#121C68')]) # Aqua +define Sp = Character ('Spears',color="#C7C7C7", who_outlines=[(gui.name_text_thickness, '#272727')]) # Light Grey +define Re = Character ('Reed',color="#ED4C5B", who_outlines=[(gui.name_text_thickness, '#421014')]) # Bright Red +define D = Character ('Driver',color="#FFECBC", who_outlines=[(gui.name_text_thickness, '#563010')]) # Yellow-Orange +define FM = Character ("Fang's Mom",color="#FFD8F6", who_outlines=[(gui.name_text_thickness, '#521947')]) # Bright Pink +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=[(gui.name_text_thickness, '#471054')]) # Pear Green +define unknown = Character ('(???)',color="#FFF", who_outlines=[(gui.name_text_thickness, '#000')]) # White +define jingo = Character ('Mr. Jingo',color="#CD8283", who_outlines=[(gui.name_text_thickness, '#0F0D49')]) # Desaturated Red +define MaitD = Character ('Maitre D',color="#AF9EFF", who_outlines=[(gui.name_text_thickness, '#241630')]) # Cobalt Blue +define Moe = Character('Moe',color="#A5BEED", who_outlines=[(gui.name_text_thickness, '#1F253B')]) # Desaturated Blue +define Vince = Character ('Vince',color="#FFECBC", who_outlines=[(gui.name_text_thickness, '#563010')]) # Yellow-Orange +define Waitress = Character ('Waitress',color="#F691C8", who_outlines=[(gui.name_text_thickness, '#512040')]) # Pink #long TB chars -define AnonAndFang = Character('Anon and Fang',color="72DFA8", who_outlines=[(1, '#113623')]) -define SV = Character ('Street Vendor',color="#F8E120", who_outlines=[(1, '#361504')]) -define carl = Character ('Mr. Carldewskii',color="#E19E40", who_outlines=[(1, '#03223B')]) -define Drf = Character ('Dr. Fernsworth',color="#253354", who_outlines=[(1, '#334573')]) -define FRT = Character ('Fang Reed & Trish',color="#4963A5", who_outlines=[(1, '#FFFFFF')]) +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=[(gui.name_text_thickness, '#58260C')]) # Yellow +define carl = Character ('Mr. Carldewskii',color="#EECB99", who_outlines=[(gui.name_text_thickness, '#082337')]) #Puke Orange +define Drf = Character ('Dr. Fernsworth',color="#DCEEF5", who_outlines=[(gui.name_text_thickness, '#253354')]) #Yellow-Orange +define FRT = Character ('Fang Reed & Trish',color="#DCBBF7", who_outlines=[(gui.name_text_thickness, '#191C78')]) #Light Purple #Extra image translations #siloettes diff --git a/game/src/mod_menu.rpy b/game/src/mod_menu.rpy index 6085dc6..efdc2df 100644 --- a/game/src/mod_menu.rpy +++ b/game/src/mod_menu.rpy @@ -10,10 +10,13 @@ screen mod_menu_button(filename, label, function): xmaximum 600 ymaximum 129 action function +<<<<<<< HEAD if 'Back' in label or 'Return' in label or 'Quit' in label or 'Main Menu' in label: activate_sound "audio/ui/uiBack.wav" else: activate_sound "audio/ui/uiClick.wav" +======= +>>>>>>> origin/Monster-Update-6 fixed: add filename xalign 0.5 yalign 0.5 zoom 0.9 text label xalign 0.5 yalign 0.5 xanchor 0.5 size 34 diff --git a/project.json b/project.json deleted file mode 100644 index b3fcb8d..0000000 --- a/project.json +++ /dev/null @@ -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} \ No newline at end of file