Merge pull request 'updates branch/feature merging into patchy-patch5' (#52) from updates into Patchy-Patch5

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

game/screens.rpy

@@ -1,14 +1,18 @@
 ###Updater Python stuff###
 init python:
+ 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():
-  renpy.notify("Updater Ran")  
-  pendingVersion = updater.UpdateVersion("http://updates.snootgame.xyz/updates.json")
+  pendingVersion = updater.UpdateVersion(persistent.updateWebServer)
   if pendingVersion == None:
-    persistent.updateresult = "No New Version is Available"
-    renpy.notify(persistent.updateresult)
+    persistent.updateresult = "No new version is available"
   else:
-    renpy.notify(persistent.updateresult + "can be downloaded")
-    updater.Update("http://updates.snootgame.xyz/updates.json", force=True)
+    persistent.updateresult = pendingVersion
 
 ################################################################################
 ## Initialization
@@ -16,7 +20,6 @@ init python:
 
 init offset = -1
 
-
 ################################################################################
 ## Styles
 ################################################################################
@@ -397,7 +400,6 @@ screen main_menu():
      imagebutton auto "gui/button/menubuttons/extrasbutton_%s.png" action ShowMenu("extras")
      imagebutton auto "gui/button/menubuttons/quitbutton_%s.png" action Quit(confirm=not main_menu)
 
-
 style main_menu_frame is empty
 style main_menu_vbox is vbox
 style main_menu_text is gui_text
@@ -731,11 +733,12 @@ screen updates():
         label "[config.name!t]"
         text _("Your Version is [config.version!t]\n")
         ##style_prefix "check"
-        label _("Auto Update")
-        #textbutton _("Enable Automatic Updates") action ToggleVariable("persistent.autoup", True, False)
-        textbutton _("Update Now!") action Function(UpdateCheck)
-        label _("Update Result:\n")
+        textbutton _("Enable Automatic Updates") action [Notify("Toggling Automatic Updates..."), ToggleVariable("persistent.autoup", True, False)]
+        text _("Automatic Updates: [persistent.autoup!t]\n")
+        textbutton _("Check for Update!") action [Notify("Checking for update..."), Function(UpdateCheck)]
+        label _("Update Check Result:\n")
         text _("[persistent.updateresult!t]\n")
+        textbutton _("Update Now!") action updater.Update(persistent.updateWebServer, force=True)
         textbutton "Back to Extras" action ShowMenu("extras")
     vbox:
         xpos 1942
@@ -935,10 +938,6 @@ 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:

game/script.rpy

@@ -23,8 +23,9 @@ init python:
         picked = random.randint(0,length - 1)
         fileName = files[picked]
         renpy.show(fileName, at_list=[randPosition])
-      if persistent.scroll == True:
-        config.keymap['dismiss'].append('mousedown_4')
+      #for issue #13 not finalized
+      #if persistent.scroll == True:
+      #   config.keymap['dismiss'].append('mousedown_5')
 
 transform randPosition:
   alpha 0.0
@@ -291,6 +292,13 @@ image black = "#000"
 label splashscreen:
   $ persistent.splashtype = random.randint(0,2000 - 1)
   $ renpy.movie_cutscene("images/intros/CaveManonProductions.webm")
+
+  if persistent.autoup:
+    python:
+      UpdateCheck()
+      if persistent.updateresult != "No new version is available":
+        updater.update(persistent.updateWebServer, force=True)
+    
   stop sound
   return
 

game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy

@@ -1853,8 +1853,6 @@ label chapter_13D:
 
     "Curled up around my pillow, suckling on her thumb."
 
-    "And my present to her still hung around securely on her neck."
-
     "I go back to the scrapbook, enjoying the memories I’ve shared with my friends."
 
     "And to think I wanted to stay a loner when I first got here."

game/script/7.concert-day.rpy

@@ -812,7 +812,7 @@ label chapter_7:
 
     "Rosa wanted to stay and help clean buuut…"
 
-    "{i}Ro I am so sorry Stella! Come, I shall nurse you back at my home!{/i}"
+    Ro "{i}I am so sorry Stella! Come, I shall nurse you back at my home!{/i}"
 
     "I’d feel more sorry for Stella but Rosa looked capable of helping her."