Merge pull request 'Android Port' (#64) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/64

.gitignore

@@ -31,3 +31,6 @@ ehthumbs_vista.db
 
 #backups
 *.bak
+
+#android
+.android.json

game/gui.rpy

@@ -445,7 +445,7 @@ init python:
 
         ## Font sizes.
         gui.text_size = 44
-        gui.name_text_size = 48
+        gui.name_text_size = 46
         gui.notify_text_size = 38
         gui.interface_text_size = 45
         gui.button_text_size = 45

game/options.rpy

@@ -23,7 +23,7 @@ define gui.show_name = True
 
 ## The version of the game.
 
-define config.version = "Patchy-patch5.1.1"
+define config.version = "Monster-Update-6"
 
 ## Text that is placed on the game's about screen. Place the text between the
 ## triple-quotes, and leave a blank line between paragraphs.

game/screens.rpy

@@ -1,23 +1,24 @@
 ###Updater Python stuff###
 init python:
- if persistent.updateresult is None:
+ if renpy.variant("pc"): #Don't run this on mobile, not supported
-  persistent.updateresult = "No new version is available"
+  if persistent.updateresult is None:
- if persistent.autoup is None:
+   persistent.updateresult = "No new version is available"
-  persistent.autoup = False
+  if persistent.autoup is None:
- if persistent.updateWebServer is None:
+   persistent.autoup = False
-  persistent.updateWebServer = "http://updates.snootgame.xyz/updates.json"
+  if persistent.updateWebServer is None:
+   persistent.updateWebServer = "http://updates.snootgame.xyz/updates.json"
 
- def UpdateCheck():
+  def UpdateCheck():
-  # WHY YES I ONLY ALLOW PEOPLE USING MY FRAMEWORK TO CHECK FOR AN UPDATE EVERY SIX FUCKING HOURS HOW DID YOU KNOW
+   # 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
+   # NOPE check_interval=5 (5 SECONDS) FUCK YOU
-  pendingVersion = updater.UpdateVersion(persistent.updateWebServer, check_interval=5)
+   pendingVersion = updater.UpdateVersion(persistent.updateWebServer, check_interval=5)
-  if pendingVersion == None or pendingVersion == config.version or "TEST" in pendingVersion:
+   if pendingVersion == None or pendingVersion == config.version or "TEST" in pendingVersion:
-    persistent.updateresult = "No new version is available"
+     persistent.updateresult = "No new version is available"
-  else:
+   else:
-    persistent.updateresult = pendingVersion
+     persistent.updateresult = pendingVersion
 
- def ToggleAutoUpdate():
+  def ToggleAutoUpdate():
-    persistent.autoup = not persistent.autoup
+     persistent.autoup = not persistent.autoup
 
 ################################################################################
 ## Initialization
@@ -132,7 +133,6 @@ screen say(who, what):
 
         text what id "what"
 
-
     ## If there's a side image, display it above the text. Do not display on the
     ## phone variant - there's no room.
     if not renpy.variant("small"):
@@ -434,7 +434,7 @@ screen main_menu():
     vbox:
         spacing 10
         xpos 1885
-        yalign 0.98
+        ypos 1130
         use main_menu_buttons("gui/button/menubuttons/template_idle.png",
             [
                 [ "Start", Start() ],
@@ -1618,8 +1618,8 @@ style pref_vbox:
 screen quick_button(filename, label, function):
     variant "small"
     button:
-        xmaximum 180
+        xmaximum 124
-        ymaximum 100
+        ymaximum 124
         action function
         fixed:
             add filename xalign 0.5 yalign 0.5 zoom 1.75
@@ -1630,6 +1630,7 @@ screen quick_menu():
     zorder 100
     if quick_menu:
         hbox:
+            spacing 28
             style_prefix "quick"
             xalign 0.5
             yalign 0.975
@@ -1641,6 +1642,28 @@ screen quick_menu():
                    [ "Menu", ShowMenu() ] \
                ] )
 
+screen extrasnavigation(): #Updates are removed (not even supported by Ren'Py)
+    variant "small"
+    vbox:
+        xpos 1940
+        yalign 0.03
+
+        if persistent.splashtype == 1:
+            add "gui/sneedgame.png"
+        else:
+            add "gui/snootgame.png"
+    vbox:
+        spacing 25
+        xpos 1885
+        yalign 0.9
+        use main_menu_buttons("gui/button/menubuttons/template_idle.png",
+            [
+                [ "Help", ShowMenu("help") ],
+                [ "About",  ShowMenu("about") ],
+                [ "Gallery", ShowMenu("cg_gallery_0") ],
+                [ "Return",  ShowMenu("main_menu") ]
+            ] )
+
 style radio_button:
     variant "small"
     foreground "gui/phone/button/radio_[prefix_]foreground.png"

game/src/cg_gallery.rpy

@@ -273,13 +273,20 @@ screen view_image(item, _origin, zoom = zoom_arr.index(1.0), flag='a'):
 #Reuse quick buttons, Ren'Py handles touch input lazy, it doesn't have
 #double finger pinch zoom, it translates taps as mouse events - have to use
 #buttons
-    if (ALLOW_ZOOM) and renpy.variant("small"):
+    hbox:
-        hbox:
+        style_prefix "quick"
-            style_prefix "quick"
+        xalign 0.5
-            xalign 0.5
+        yalign 0.975
-            yalign 0.975
+        if (ALLOW_ZOOM) and renpy.variant("small"):
             use quick_buttons("gui/button/uioptionbuttons/template_idle.png",
                [
                    [ "+", zoom_a_f ],
-                   [ "-", zoom_b_f ]
+                   [ "-", zoom_b_f ],
+                   [ "Return", zoom_b_f ]
                ] )
+        else:
+            use quick_buttons("gui/button/uioptionbuttons/template_idle.png",
+               [
+                   [ "Return", _origin ]
+               ] )
+