Merge pull request 'Prune assets & Variant force' (#174) from nutbuster/SnootGame:Patch7 into Patch7

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/174
This commit is contained in:
Nutbuster 2021-11-27 02:04:41 +00:00
commit 52f497efc1
16 changed files with 18 additions and 53 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 378 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 778 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 754 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 553 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 961 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 606 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 423 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 373 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 360 KiB

View File

@ -1738,7 +1738,7 @@ style pref_vbox:
#redefine function #redefine function
screen quick_button(filename, label, function): screen quick_button(filename, label, function):
variant "small" variant "small mobile"
button: button:
xmaximum 124 xmaximum 124
ymaximum 124 ymaximum 124
@ -1748,7 +1748,7 @@ screen quick_button(filename, label, function):
text label xalign 0.5 yalign 0.5 size 42 style "quick_button_text" text label xalign 0.5 yalign 0.5 size 42 style "quick_button_text"
screen quick_menu(): screen quick_menu():
variant "small" variant "small mobile"
zorder 100 zorder 100
if quick_menu: if quick_menu:
hbox: hbox:
@ -1765,7 +1765,7 @@ screen quick_menu():
] ) ] )
screen extrasnavigation(): #Updates are removed (not even supported by Ren'Py) screen extrasnavigation(): #Updates are removed (not even supported by Ren'Py)
variant "small" variant "small mobile"
vbox: vbox:
xpos 1940 xpos 1940
yalign 0.03 yalign 0.03
@ -1787,73 +1787,73 @@ screen extrasnavigation(): #Updates are removed (not even supported by Ren'Py)
] ) ] )
style radio_button: style radio_button:
variant "small" variant "small mobile"
foreground "gui/phone/button/radio_[prefix_]foreground.png" foreground "gui/phone/button/radio_[prefix_]foreground.png"
style check_button: style check_button:
variant "small" variant "small mobile"
foreground "gui/phone/button/check_[prefix_]foreground.png" foreground "gui/phone/button/check_[prefix_]foreground.png"
style nvl_window: style nvl_window:
variant "small" variant "small mobile"
background "gui/phone/nvl.png" background "gui/phone/nvl.png"
style game_menu_outer_frame: style game_menu_outer_frame:
variant "small" variant "small mobile"
background "gui/phone/overlay/game_menu.png" background "gui/phone/overlay/game_menu.png"
style game_menu_navigation_frame: style game_menu_navigation_frame:
variant "small" variant "small mobile"
xsize 510 xsize 510
style game_menu_content_frame: style game_menu_content_frame:
variant "small" variant "small mobile"
top_margin 0 top_margin 0
style pref_vbox: style pref_vbox:
variant "small" variant "small mobile"
xsize 600 xsize 600
style bar: style bar:
variant "small" variant "small mobile"
ysize gui.bar_size ysize gui.bar_size
left_bar Frame("gui/phone/bar/left.png", gui.bar_borders, tile=gui.bar_tile) left_bar Frame("gui/phone/bar/left.png", gui.bar_borders, tile=gui.bar_tile)
right_bar Frame("gui/phone/bar/right.png", gui.bar_borders, tile=gui.bar_tile) right_bar Frame("gui/phone/bar/right.png", gui.bar_borders, tile=gui.bar_tile)
style vbar: style vbar:
variant "small" variant "small mobile"
xsize gui.bar_size xsize gui.bar_size
top_bar Frame("gui/phone/bar/top.png", gui.vbar_borders, tile=gui.bar_tile) top_bar Frame("gui/phone/bar/top.png", gui.vbar_borders, tile=gui.bar_tile)
bottom_bar Frame("gui/phone/bar/bottom.png", gui.vbar_borders, tile=gui.bar_tile) bottom_bar Frame("gui/phone/bar/bottom.png", gui.vbar_borders, tile=gui.bar_tile)
style scrollbar: style scrollbar:
variant "small" variant "small mobile"
ysize gui.scrollbar_size ysize gui.scrollbar_size
base_bar Frame("gui/phone/scrollbar/horizontal_[prefix_]bar.png", gui.scrollbar_borders, tile=gui.scrollbar_tile) base_bar Frame("gui/phone/scrollbar/horizontal_[prefix_]bar.png", gui.scrollbar_borders, tile=gui.scrollbar_tile)
thumb Frame("gui/phone/scrollbar/horizontal_[prefix_]thumb.png", gui.scrollbar_borders, tile=gui.scrollbar_tile) thumb Frame("gui/phone/scrollbar/horizontal_[prefix_]thumb.png", gui.scrollbar_borders, tile=gui.scrollbar_tile)
style vscrollbar: style vscrollbar:
variant "small" variant "small mobile"
xsize gui.scrollbar_size xsize gui.scrollbar_size
base_bar Frame("gui/phone/scrollbar/vertical_[prefix_]bar.png", gui.vscrollbar_borders, tile=gui.scrollbar_tile) base_bar Frame("gui/phone/scrollbar/vertical_[prefix_]bar.png", gui.vscrollbar_borders, tile=gui.scrollbar_tile)
thumb Frame("gui/phone/scrollbar/vertical_[prefix_]thumb.png", gui.vscrollbar_borders, tile=gui.scrollbar_tile) thumb Frame("gui/phone/scrollbar/vertical_[prefix_]thumb.png", gui.vscrollbar_borders, tile=gui.scrollbar_tile)
style slider: style slider:
variant "small" variant "small mobile"
ysize gui.slider_size ysize gui.slider_size
base_bar Frame("gui/phone/slider/horizontal_[prefix_]bar.png", gui.slider_borders, tile=gui.slider_tile) base_bar Frame("gui/phone/slider/horizontal_[prefix_]bar.png", gui.slider_borders, tile=gui.slider_tile)
thumb "gui/phone/slider/horizontal_[prefix_]thumb.png" thumb "gui/phone/slider/horizontal_[prefix_]thumb.png"
style vslider: style vslider:
variant "small" variant "small mobile"
xsize gui.slider_size xsize gui.slider_size
base_bar Frame("gui/phone/slider/vertical_[prefix_]bar.png", gui.vslider_borders, tile=gui.slider_tile) base_bar Frame("gui/phone/slider/vertical_[prefix_]bar.png", gui.vslider_borders, tile=gui.slider_tile)
thumb "gui/phone/slider/vertical_[prefix_]thumb.png" thumb "gui/phone/slider/vertical_[prefix_]thumb.png"
style slider_pref_vbox: style slider_pref_vbox:
variant "small" variant "small mobile"
xsize None xsize None
style slider_pref_slider: style slider_pref_slider:
variant "small" variant "small mobile"
xsize 900 xsize 900

View File

@ -787,7 +787,6 @@ image naser tablehit = "naser/naser table hit.png"
image naser tablehit flip = im.Flip("naser/naser table hit.png", horizontal=True) image naser tablehit flip = im.Flip("naser/naser table hit.png", horizontal=True)
image naomi future flip = im.Flip('images/naomi/naomi future.png', horizontal=True) image naomi future flip = im.Flip('images/naomi/naomi future.png', horizontal=True)
image fang d happy flip = im.Flip('images/fang/future sets/fang d happy.png', horizontal=True) image fang d happy flip = im.Flip('images/fang/future sets/fang d happy.png', horizontal=True)
image naser neckhold flip = im.Flip('images/naser/naserneckhold.png', horizontal=True)
image anon grin = 'images/anon/base set/anon grin.png' image anon grin = 'images/anon/base set/anon grin.png'
image anon grin flip = im.Flip('images/anon/base set/anon grin.png', horizontal=True) image anon grin flip = im.Flip('images/anon/base set/anon grin.png', horizontal=True)
image tracy neutral flip = im.Flip('images/tracy/tracy neutral.png', horizontal=True) image tracy neutral flip = im.Flip('images/tracy/tracy neutral.png', horizontal=True)

View File

@ -1,44 +1,10 @@
#high res flip - i hate this
image anon neutral megatex flip = im.Flip("highres/anon neutral megatex.png", horizontal=True)
image anon shrug megatex flip = im.Flip("highres/anon shrug megatex.png", horizontal=True)
image anond neutral megatex flip = im.Flip("highres/anond neutral megatex.png", horizontal=True)
image fang neutral megatex flip = im.Flip("highres/fang neutral megatex.png", horizontal=True)
image fang flip off happy megatex flip = im.Flip("highres/fang flip off happy megatex.png", horizontal=True)
image fang very sad megatex flip = im.Flip("highres/fang very sad megatex.png", horizontal=True)
image naomi neutral megatex flip = im.Flip("highres/naomi neutral megatex.png", horizontal=True)
""" """
show fang pbird happy flip with dissolve show fang pbird happy flip with dissolve
show fang pneutral flip with Dissolve(1) show fang pneutral flip with Dissolve(1)
""" """
#pENdant - wait what the fuck there's PBIRD AND FLIP OFF? #pENdant - wait what the fuck there's PBIRD AND FLIP OFF?
image fang pneutral megatex = Composite(
# (1412, 1500),
(2683, 2850),
(0, 0), "highres/fang neutral megatex.png",
(0, 0), "highres/amberpendant1 megatex.png"
)
image fang pbird happy megatex = Composite(
# (1412, 1500),
(2683, 2850),
(0, 0), "highres/fang flip off happy megatex.png",
(0, 0), "highres/amberpendant1 megatex.png"
)
image fang pneutral megatex flip = Composite(
# (1412, 1500),
(2683, 2850),
(0, 0), im.Flip("highres/fang neutral megatex.png", horizontal=True),
(0, 0), im.Flip("highres/amberpendant1 megatex.png", horizontal=True)
)
image fang pbird happy megatex flip = Composite(
# (1412, 1500),
(2683, 2850),
(0, 0), im.Flip("highres/fang flip off happy megatex.png", horizontal=True),
(0, 0), im.Flip("highres/amberpendant1 megatex.png", horizontal=True)
)
#bluralt #bluralt
image anon neutral blur flip = im.Flip("highres/bluralt/anon neutral blur.png", horizontal=True) image anon neutral blur flip = im.Flip("highres/bluralt/anon neutral blur.png", horizontal=True)
image anon shrug blur flip = im.Flip("highres/bluralt/anon shrug blur.png", horizontal=True) image anon shrug blur flip = im.Flip("highres/bluralt/anon shrug blur.png", horizontal=True)