Update from upstream

README.md

@@ -17,8 +17,10 @@ Preface: This only supports Visual Studio on Windows and Xcode on macOS. Ubuntu
 With Python 3 and pip installed, install Conan via `pip3 install conan`. Afterwards, add the necessary package repositories by adding running the following commands:
 
 ```sh
-conan remote add eliza "https://api.bintray.com/conan/eliza/conan"
-conan remote add bincrafters "https://api.bintray.com/conan/bincrafters/public-conan"
+conan remote add eliza https://rkevin.jfrog.io/artifactory/api/conan/eliza
+conan remote add bincrafters https://bincrafters.jfrog.io/artifactory/api/conan/public-conan
+conan config set general.revisions_enabled=1
+setx CONAN_USE_ALWAYS_SHORT_PATHS 1 (windows only)
 ```
 
 Prepare to build *OneShot* by installing the necessary dependencies with Conan.

conanfile.py

@@ -40,9 +40,9 @@ class MkxpConan(ConanFile):
         "cygwin_installer:with_pear=False",
     )
 
-    def build_requirements(self):
-        if tools.os_info.is_windows:
-            self.build_requires("cygwin_installer/2.9.0@bincrafters/stable")
+    #def build_requirements(self):
+       # if tools.os_info.is_windows:
+            # self.build_requires("cygwin_installer/2.9.0@bincrafters/stable")
 
     def requirements(self):
         if self.options.platform == "steam":
@@ -58,28 +58,29 @@ def requirements(self):
     def configure(self):
         if tools.os_info.is_windows:
             # ???
-            self.options.openal.shared = True
+            self.options["openal"].shared = True
             # Fix linker error in SDL_sound fork with SDL2
-            self.options.sdl2.shared = True
+            self.options["sdl2"].shared = True
 
     def build_configure(self):
-        cmake = CMake(self)
+        cmake = CMake(self, msbuild_verbosity='minimal')
         if self.options.platform == "steam":
             cmake.definitions["STEAM"] = "ON"
         cmake.configure()
         cmake.build()
 
     def build(self):
-        if tools.os_info.is_windows:
-            cygwin_bin = self.deps_env_info["cygwin_installer"].CYGWIN_BIN
-            with tools.environment_append({
-                    "PATH": [cygwin_bin],
-                    "CONAN_BASH_PATH":
-                    os.path.join(cygwin_bin, "bash.exe")
-            }):
-                self.build_configure()
-        else:
-            self.build_configure()
+        #if tools.os_info.is_windows:
+        #    cygwin_bin = self.deps_env_info["cygwin_installer"].CYGWIN_BIN
+        #    with tools.environment_append({
+        #            "PATH": [cygwin_bin],
+        #            "CONAN_BASH_PATH":
+        #            os.path.join(cygwin_bin, "bash.exe")
+        #    }):
+        #        self.build_configure()
+        #else:
+        #    self.build_configure()
+        self.build_configure()
 
     def package(self):
         self.copy("*", dst="bin", src="bin")
@@ -106,4 +107,4 @@ def do_copy_deps(self, copy):
                  root_package=dep,
                  keep_path=True)
             if self.settings.build_type == "Debug":
-                copy("*.pdb", dst="bin", root_package=dep, keep_path=False)
+                copy("*.pdb", dst="bin", root_package=dep, keep_path=False)

journal/w32/journal/journal.vcxproj

@@ -115,7 +115,7 @@
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -143,7 +143,7 @@
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>

journal/w32/journal/src/journal.c

@@ -161,13 +161,13 @@ DWORD WINAPI ipc_thread(LPVOID lpParam)
 void init_check_save(WCHAR* save_path) {
   FILE* savefile = _wfopen(save_path, L"rb");
   char imgfile[16] = {0};
-  char langbuf[9] = {0};
+  char langbuf[17] = {0};
   char* openbrace = 0;
   char* closebrace = 0;
   if (savefile) {
     strcpy(imgfile, "save");
-    fseek(savefile, -8, SEEK_END);
-    fread(langbuf, 1, 8, savefile);
+    fseek(savefile, -16, SEEK_END);
+    fread(langbuf, 1, 16, savefile);
     fclose(savefile);
 
     openbrace = strchr(langbuf, '[');

scripts/Game_Oneshot.rb

@@ -42,23 +42,18 @@ def self.set_persistent(name, color)
       end
       Graphics.update
     end
-
-    if (name == 'save_w32')
-	  case $persistent.langcode
-	    when 'fr'
-          name = $persistent.langcode + "/" + name
-	    when 'pt_BR'
-	      name = $persistent.langcode + "/" + name
-	    when 'es'
-	      name = $persistent.langcode + "/" + name
-	    when 'ja'
-	      name = $persistent.langcode + "/" + name
-	    when 'ko'
-	      name = $persistent.langcode + "/" + name
-	    when 'zh_CN'
-	      name = $persistent.langcode + "/" + name
-      end
+
+	locWallpaper = $persistent.langcode + "/" + name
+	if (name == 'save_w32')
+		locWallpaperFullPath = "Wallpaper/" + locWallpaper + ".bmp"
+	else
+		locWallpaperFullPath = "Wallpaper/" + locWallpaper + ".png"
+	end
+
+	if File.exists?(locWallpaperFullPath)
+		name = locWallpaper
 	end
+
     $game_oneshot.wallpaper = name
     $game_oneshot.wallpaper_color = color
     Wallpaper.set(name, color)

scripts/Game_Party.rb

@@ -131,15 +131,17 @@ def remove_actor(actor_id)
     actor = $game_actors[actor_id]
     # Delete follower
     unless $game_followers.empty?
-      follower = $game_followers.pop
-      $scene.remove_follower(follower)
-      new_actor = follower.actor
-	  if new_actor != actor
-        $game_followers.reverse_each do |follower|
-          new_actor, follower.actor = follower.actor, new_actor
-          break if new_actor == actor
+      for i in 0...$game_followers.size
+        follower = $game_followers[i]
+        if follower.actor.id == actor.id
+          if $game_followers.size > i + 1
+            $game_followers[i + 1].leader = follower.leader
+          end
+          $game_followers.delete_at(i)
+          $scene.remove_follower(follower)
+          break
         end
-	  end
+      end
     end
     # Delete actor
     @actors.delete(actor)

scripts/Game_Temp.rb

@@ -66,6 +66,7 @@ class Game_Temp
   attr_accessor :prompt_wait              # wait for delay caused by prompt
   attr_accessor :menus_visible
   attr_accessor :countdown_password
+  attr_accessor :igt_timer_visible
   #--------------------------------------------------------------------------
   # * Object Initialization
   #--------------------------------------------------------------------------
@@ -123,8 +124,9 @@ def initialize
     @footstep_sfx = nil
     @filmsprite = nil
     @prompt_wait = 0
-	@menus_visible = false
-	@countdown_password = ""
+    @menus_visible = false
+    @countdown_password = ""
+    @igt_timer_visible = false
   end
 
   def bgm_fadein(game_system)