Merge branch 'Monster-Update-6' into chapter-1-choreo

# Conflicts:
#	game/script.rpy
This commit is contained in:
Bowie 2021-07-03 15:52:39 +01:00
commit f7db5fb407
5 changed files with 26 additions and 35 deletions

View File

@ -435,10 +435,8 @@ init python:
gui.label_text_size = 51
## Adjust the location of the textbox.
gui.textbox_height = 360
gui.name_xpos = 120
gui.text_xpos = 135
gui.text_width = 1650
gui.textbox_height = int(gui.textbox_height * 1.263157) # ~360
gui.text_width = 1650 # not needed
## Change the size and spacing of various things.
gui.slider_size = 54

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@ -385,7 +385,7 @@ screen main_menu():
imagebutton auto "gui/button/menubuttons/helpbutton_%s.png" action ShowMenu("extras")
imagebutton auto "gui/button/menubuttons/quitbutton_%s.png" action Quit(confirm=not main_menu)
# if gui.show_name:
#
# vbox:
@ -836,6 +836,11 @@ screen preferences():
style_prefix "check"
label _("Naughty Stuff")
textbutton _("Enable Lewd Images") action ToggleVariable("persistent.lewd", True, False)
vbox:
style_prefix "check"
label _("Requires Restart")
textbutton _("Enable Forward-Scroll Movement") action ToggleVariable("persistent.scroll", True, False)
vbox:
@ -1526,24 +1531,28 @@ style pref_vbox:
## Since a mouse may not be present, we replace the quick menu with a version
## that uses fewer and bigger buttons that are easier to touch.
screen quick_button(filename, label, function):
button:
xmaximum 160
ymaximum 100
action function
fixed:
add filename xalign 0.5 yalign 0.5 zoom 1.75
text label xalign 0.5 yalign 0.5 size 42 color "#000000EE"
screen quick_menu():
variant "touch"
variant "small"
zorder 100
if quick_menu:
hbox:
style_prefix "quick"
xalign 0.5
yalign 1.0
textbutton _("Back") action Rollback()
textbutton _("Skip") action Skip() alternate Skip(fast=True, confirm=True)
textbutton _("Auto") action Preference("auto-forward", "toggle")
textbutton _("Menu") action ShowMenu()
yalign 0.975
use quick_button("gui/button/uioptionbuttons/template_idle.png", "Back", Rollback())
use quick_button("gui/button/uioptionbuttons/template_idle.png", "Skip", Skip()) #alternate Skip(fast=True, confirm=True))
use quick_button("gui/button/uioptionbuttons/template_idle.png", "Auto", Preference("auto-forward", "toggle"))
use quick_button("gui/button/uioptionbuttons/template_idle.png", "Menu", ShowMenu())
style window:
variant "small"

View File

@ -29,9 +29,8 @@ init python:
# allows playing looped ambience alongside music
renpy.music.register_channel("ambient","sfx",True,tight=True)
renpy.music.register_channel("ambient1","sfx",True,tight=True)
#for issue #13 not finalized
#if persistent.scroll == True:
# config.keymap['dismiss'].append('mousedown_5')
if persistent.scroll == True:
config.keymap['dismiss'].append('mousedown_4')
transform randPosition:
alpha 0.0
@ -104,21 +103,6 @@ image ctc_mid_marker:
linear 0.5 alpha 0
repeat
# image ctc_end_marker:
# "pickicon"
# xalign 0.9 yalign 0.98
# pause 0.5
# xalign 0.92
# pause 0.5
# repeat
# image ctc_mid_marker:
# "pickicon"
# xalign 0.9 yalign 0.98
# pause 0.5
# xalign 0.92
# pause 0.5
# repeat
#Characters
define base = Character (ctc="ctc_end_marker", ctc_pause="ctc_mid_marker", ctc_timedpause=Null(), ctc_position="fixed") # try to remember some of the basics of CTC
define I = Character(kind=base) # for internal dialogue i.e narration. Required for CTC indicators working with Anon's thoughts