game/mods/.gitignore

@@ -1,5 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file and ExampleMod
-!.gitignore
-!ExampleMod/

game/scripts/characters/astoria/common.rpy

@@ -38,7 +38,7 @@ init python:
         emote=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, **kwargs):
 
         def show():
-            astoria.show(force=True)
+            astoria.show()
 
             if not renpy.in_rollback():
                 renpy.with_statement(trans or d2)

game/scripts/characters/cho/common.rpy

@@ -36,7 +36,7 @@ init python in character:
         emote=None, face=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, **kwargs):
 
         def show():
-            renpy.store.cho.show(force=True)
+            renpy.store.cho.show()
 
             if not renpy.in_rollback():
                 renpy.with_statement(trans or renpy.store.d2)

game/scripts/characters/hermione/common.rpy

@@ -31,7 +31,7 @@ init python:
         emote=None, face=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, **kwargs):
 
         def show():
-            hermione.show(force=True)
+            hermione.show()
 
             if not renpy.in_rollback():
                 renpy.with_statement(trans or d2)

game/scripts/characters/hooch/common.rpy

@@ -22,7 +22,7 @@ init python:
         emote=None, face=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, **kwargs):
 
         def show():
-            hooch.show(force=True)
+            hooch.show()
 
             if not renpy.in_rollback():
                 renpy.with_statement(trans or d2)

game/scripts/characters/luna/common.rpy

@@ -34,7 +34,7 @@ init python:
         emote=None, face=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, **kwargs):
 
         def show():
-            luna.show(force=True)
+            luna.show()
 
             if not renpy.in_rollback():
                 renpy.with_statement(trans or d2)

game/scripts/characters/susan/common.rpy

@@ -33,7 +33,7 @@ init python:
         emote=None, face=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, **kwargs):
 
         def show():
-            susan.show(force=True)
+            susan.show()
 
             if not renpy.in_rollback():
                 renpy.with_statement(trans or d2)

game/scripts/characters/tonks/common.rpy

@@ -44,7 +44,7 @@ init python:
     emote=None, face=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, **kwargs):
 
         def show():
-            tonks.show(force=True)
+            tonks.show()
 
             if not renpy.in_rollback():
                 renpy.with_statement(trans or d2)

game/scripts/characters/tonks/summon.rpy

@@ -126,7 +126,7 @@ label tonks_favor_menu:
 
             $ result = show_events_menu(tonks_requests)
 
-            if result in ("disabled", "noncompliant"):
+            if result == "disabled":
                 "You haven't unlocked this request opportunity yet."
                 jump .requests
             elif result == "exit":

game/scripts/doll/clothes.rpy

@@ -383,8 +383,7 @@ init python:
 
         def clone(self):
             """Creates a clone of this cloth object. Since it requires a parent object it should be used internally only to avoid object depth issue."""
-            modpath = self.modpath.lstrip("mods/")
-            return DollCloth(self.name, self.categories, self.type, self.id, [x for x in self.color] if self.color else None, self.zorder, self.unlocked, self.level, self.blacklist, modpath, self)
+            return DollCloth(self.name, self.categories, self.type, self.id, [x for x in self.color] if self.color else None, self.zorder, self.unlocked, self.level, self.blacklist, self.modpath, self)
 
         def is_modded(self):
             """Returns True if item comes from a mod."""

game/scripts/doll/clothes_dynamic.rpy

@@ -183,5 +183,4 @@ init python:
 
         def clone(self):
             """Creates a clone of this cloth object. Since it requires a parent object it should be used internally only to avoid object depth issue."""
-            modpath = self.modpath.lstrip("mods/")
-            return DollClothDynamic(self.name, self.categories, self.type, self.id, [x for x in self.color] if self.color else None, self.zorder, self.unlocked, self.level, self.blacklist, modpath, self._tracking, self)
+            return DollClothDynamic(self.name, self.categories, self.type, self.id, [x for x in self.color] if self.color else None, self.zorder, self.unlocked, self.level, self.blacklist, self.modpath, self._tracking, self)

game/scripts/doll/common.rpy

@@ -78,11 +78,8 @@ init -1 python:
     def DollRebuild():
         for i in states.dolls:
             doll = getattr(store, i)
-
-            if doll.is_stale() and not settings.get("multithreading"):
-                doll.show(ignore_skipping=True)
-
+            doll.build_image()
         renpy.restart_interaction()
 
     config.after_load_callbacks.append(DollRebuild)
-    end_skip_callbacks.append(DollRebuild)
+    # end_skip_callbacks.append(DollRebuild)

game/scripts/doll/makeup.rpy

@@ -62,5 +62,4 @@ init python:
 
         def clone(self):
             """Creates a clone of this cloth object. Since it requires a parent object it should be used internally only to avoid object depth issue."""
-            modpath = self.modpath.lstrip("mods/")
-            return DollMakeup(self.name, self.categories, self.type, self.id, [x for x in self.color] if self.color else None, self.zorder, self.unlocked, self.level, self.blacklist, modpath, self, self.tracking)
+            return DollMakeup(self.name, self.categories, self.type, self.id, [x for x in self.color] if self.color else None, self.zorder, self.unlocked, self.level, self.blacklist, self.modpath, self, self.tracking)

game/scripts/gui/main_menu.rpy

@@ -255,7 +255,7 @@ screen navigation(title=None):
             if not title:
 
                 if not renpy.mobile:
-                    if version_float(UPDATE_VER) > version_float():
+                    if version_float(UPDATE_VER) < version_float():
                         textbutton "Install updates" action InstallUpdates() style_prefix "update_available" sensitive (not prerelease)
                     else:
                         textbutton "Check for updates" action CheckUpdates(300) sensitive (not prerelease)

game/scripts/gui/mods.rpy

@@ -63,7 +63,7 @@ screen mods():
                                 text "[name]":
                                     style "mods_text"
                                     size 16
-                                    if not compat >= mods_compatible:
+                                    if not compat >= compatible_version:
                                         color "#ff8000"
 
                                 text "[version]":
@@ -101,7 +101,7 @@ screen mods():
                             add logo xalign 0.5 size (320, 240)
                             text "[name]\n[version]" offset (6, 6)
 
-                            if not compat >= mods_compatible:
+                            if not compat >= compatible_version:
                                 text "{color=#ff8000}[compat]{/color}" align (1.0, 1.0) offset (-6, -3)
                             else:
                                 text "{color=#228B22}[compat]{/color}" align (1.0, 1.0) offset (-6, -3)

game/scripts/gui/preferences.rpy

@@ -63,7 +63,6 @@ screen preferences_general():
                 textbutton _("Tooltips") action settings.Toggle("tooltip")
                 textbutton _("System Cursor") action Preference("system cursor", "toggle")
                 textbutton _("Automatic Updates") action settings.Toggle("updates")
-                textbutton _("Autosave") action ToggleField(store, "_autosave")
 
         default trans = config.intra_transition
 

game/scripts/interface/achievements.rpy

@@ -83,9 +83,6 @@ init python:
             return self.achievements.get(id)[3]
 
         def unlock(self, id, silent=False):
-            if _in_replay:
-                return
-
             if persistent.achievements[id][3] == False:
                 self.achievements[id][3] = True
                 persistent.achievements[id][3] = True

game/scripts/minigames/cardgame/__card_game_init__.rpy

@@ -579,7 +579,7 @@ init python:
 
         while min > get_deck_score(new_deck) or max < get_deck_score(new_deck):
             replace_index = 0
-            if get_deck_score(new_deck) < min:
+            if new_deck < min:
                 replace_index = find_index_func(temp_pool, smalles_func)
             else:
                 replace_index = find_index_func(temp_pool, gretest_func)