From 8363c69a6b1e6fd862ca03dac097b72919859bd7 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Fri, 27 May 2022 23:05:06 +0100
Subject: [PATCH] Build distribution & Misc

* Added asset archives for distributed builds
* Added platform specific classification for files
* Changed save directory from "WT SILVER" to "WTS"
* Changed executable name from "WT SILVER" to "WTS"
* Removed redundant font file
* Moved mods.rpy to scripts directory
---
 game/fonts/CREABBB.TTF             |  3 --
 game/{modules => scripts}/mods.rpy |  0
 game/scripts/options.rpy           | 85 +++++++++++++++++++-----------
 game/scripts/utility/editor.rpy    |  2 +
 4 files changed, 57 insertions(+), 33 deletions(-)
 delete mode 100644 game/fonts/CREABBB.TTF
 rename game/{modules => scripts}/mods.rpy (100%)

diff --git a/game/fonts/CREABBB.TTF b/game/fonts/CREABBB.TTF
deleted file mode 100644
index ee67632d..00000000
--- a/game/fonts/CREABBB.TTF
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cf6abbcb2a8f0134e3b8845a6b5ba46c8e00c66deb2a2c116dcd74991f514dc0
-size 69980
diff --git a/game/modules/mods.rpy b/game/scripts/mods.rpy
similarity index 100%
rename from game/modules/mods.rpy
rename to game/scripts/mods.rpy
diff --git a/game/scripts/options.rpy b/game/scripts/options.rpy
index 6aa5f3dd..396880fb 100644
--- a/game/scripts/options.rpy
+++ b/game/scripts/options.rpy
@@ -14,14 +14,14 @@ python early:
         os.environ["RENPY_LESS_MEMORY"] = "1"
 
 init python:
-    settings.default('theme', 'auto')
-    settings.default('text_color_day', '#402313ff')
-    settings.default('text_color_night', '#341c0fff')
-    settings.default('text_outline', '#00000000')
-    settings.default('tooltip', True)
-    settings.default('tutorials', True)
-    settings.default('preserve_aspect_ratio', True)
-    settings.default('animations', True)
+    settings.default("theme", "auto")
+    settings.default("text_color_day", "#402313ff")
+    settings.default("text_color_night", "#341c0fff")
+    settings.default("text_outline", "#00000000")
+    settings.default("tooltip", True)
+    settings.default("tutorials", True)
+    settings.default("preserve_aspect_ratio", True)
+    settings.default("animations", True)
 
 # Configuration
 # https://www.renpy.org/doc/html/config.html
@@ -89,7 +89,7 @@ init -1:
     define config.late_images_scan = True
 
 # Saving and loading
-define config.save_directory = "WT SILVER"
+define config.save_directory = "WTS"
 define config.has_autosave = True
 define config.autosave_on_quit = True
 define config.autosave_on_choice = True
@@ -135,27 +135,52 @@ define config.gc_print_unreachable = False
 ################################################
 
 init python:
-    build.directory_name = "WTS"
-    build.executable_name = "WT Silver"
-    build.include_update = False # If True, include update information into packages (allows the updater to run)
-    build.exclude_empty_directories = False
+    build.name = "WTS"
+    build.include_update = False
+    build.include_old_themes = False
+    build.exclude_empty_directories = True
 
-    build.classify("game/images.whitespace", "all")
-    build.classify('**~', None)
-    build.classify("**.exe", None)
-    build.classify("**.psd", None)
-    build.classify("**.old", None)
-    build.classify('**.bak', None)
-    build.classify("**.kra", None)
+    build.archive("scripts", "all")
+    build.archive("characters", "all")
+    build.archive("images", "all")
+    build.archive("sounds", "all")
+    build.archive("music", "all")
+    build.archive("gui", "all")
+
+    build.classify("game/scripts/**.rpy", "scripts")
+    build.classify("game/scripts/**.rpyc", "scripts")
+    build.classify("old-game/scripts/**.rpy", "old")
+    build.classify("old-game/scripts/**.rpyc", "old")
+    build.classify("game/images.whitespace", "scripts")
+    build.classify("game/characters/**.webp", "characters")
+    build.classify("game/images/**.webp", "images")
+    build.classify("game/images/**.webm", "images")
+    build.classify("game/sounds/**.ogg", "sounds")
+    build.classify("game/music/**.ogg", "music")
+
+    build.classify("game/gui/**", "gui")
+    build.classify("game/interface/**.webp", "gui")
+    build.classify("android-icon_*.png", "android gui")
+    build.classify("android-presplash.jpg", "android gui")
+    build.classify("icon.icns", "mac gui")
+    build.classify("icon.ico", "windows gui")
+    build.classify("game/presplash_*.png", "mac windows linux gui")
+    build.classify("game/outfits/**", "mac windows linux")
+
+    build.classify("**.py", None)
     build.classify("**.txt", None)
-    build.classify("**.xml", None)
-    build.classify('**/thumbs.db', None)
-    build.classify("game/saves/**", None)
-    build.classify("game/outfits/**", None)
-    build.classify("game/music/not_used/**", None)
-    build.classify("build/", None)
-    build.classify("build-*", None)
-    build.classify("README.md", None)
-    build.classify("build_patch.py", None)
+    build.classify("**.md", None)
+    build.classify("**.png", None)
+    build.classify("**.jpg", None)
+    build.classify("**.jpeg", None)
+    build.classify("**.json", None)
+    build.classify("LICENSE", None)
+    build.classify("**.bak", None)
+    build.classify("**.old", None)
+    build.classify("**~", None)
+    build.classify("**.db", None)
+    build.classify("**.zip", None)
+
+    build.classify("cache/**", None)
+    build.classify("game/saves/**", None)
 
-    build.allow_integrated_gpu = True # Only affects MacOS
diff --git a/game/scripts/utility/editor.rpy b/game/scripts/utility/editor.rpy
index 38120c68..c6899ad9 100644
--- a/game/scripts/utility/editor.rpy
+++ b/game/scripts/utility/editor.rpy
@@ -415,6 +415,8 @@ init python:
 
         #config.all_character_callbacks.append(e.catch) # This is more efficient.
         config.start_interact_callbacks.append(e.catch) # This allows to catch more statements and reset them if node types don't match.
+    else:
+        e = dict() # Hotkey crashes on release otherwise.
 
 screen editor():
     zorder 50