Merge branch 'master' of ssh://code.nikooneshot.ru:222/Sunshine/mkxp-sunshine

oneshot.conf

@@ -154,3 +154,6 @@ Modloader.ModsDirPath="mods"
 # Use default path for saves and settings like if you run game
 # without mods
 Modloader.use_default_save_path=false
+
+# Pancake episode specific tweaks
+pancakes=false

scripts/Game_Temp.rb

@@ -66,6 +66,11 @@ class Game_Temp
   attr_accessor :menus_visible
   attr_accessor :countdown_password
   attr_accessor :igt_timer_visible
+
+  # For Pancake episode
+  attr_accessor :igt_timer_final_time
+  attr_accessor :igt_timer_stopped
+  
   #--------------------------------------------------------------------------
   # * Object Initialization
   #--------------------------------------------------------------------------
@@ -125,7 +130,9 @@ class Game_Temp
     @menus_visible = false
     @countdown_password = ""
     @igt_timer_visible = false
-    RPG::Mod.exec_hooks("hooks/Game_Temp/init", binding)
+    #Panckake episode
+	@igt_timer_stopped = false
+	@igt_timer_final_time = 0
   end
 
   def bgm_fadein(game_system)

scripts/Scene_Title.rb

@@ -8,7 +8,7 @@ class Scene_Title
   MENU_X = Graphics.width - 150
   MENU_Y = Graphics.height - 100
   SDLVer = "#{Sunshine::SDLVersion_major}.#{Sunshine::SDLVersion_minor}.#{Sunshine::SDLVersion_micro}"
-  SunshineVer = "0.1.1-dev"
+  SunshineVer = "0.1.4-dev"
   
   #--------------------------------------------------------------------------
   # * Main Processing

scripts/Script.rb

@@ -5,6 +5,24 @@ RUE_TEXT = "put me in the big portal"
 SUPPORTED_DE = ["cinnamon", "mate", "kde", "xfce", "gnome", "lxde", "lxqt"]
 
 module Script
+  #For Pancake episode support###
+  def self.start_plight_timer
+    $game_oneshot.bruteforce_start = Graphics.frame_count
+  end
+
+  def self.plight_timer_vars
+    if($game_oneshot.bruteforce_start == nil)
+      $game_oneshot.bruteforce_start = Graphics.frame_count
+    end
+    time_passed = Graphics.frame_count - $game_oneshot.bruteforce_start
+    seconds = time_passed / 60
+    digit1 = seconds % 60
+    digit2 = (seconds - digit1) / 60
+    $game_variables[29] = digit2
+    $game_variables[30] = digit1
+  end
+  ################################	
+
   def self.px
     logpos($game_player.x, $game_player.real_x, $game_player.direction == 6)
   end
@@ -778,3 +796,8 @@ def activate_balcony?(ypos)
   $game_player.direction == 8 &&
   Input.trigger?(Input::ACTION) && !$game_system.map_interpreter.running? && !$game_temp.menus_visible
 end
+
+def stop_igt
+  $game_temp.igt_timer_stopped = true
+  $game_temp.igt_timer_final_time = Graphics.frame_count
+end

src/config.cpp

@@ -78,6 +78,7 @@ void Config::read(int argc, char *argv[]){
 	PO_DESC(defScreenW, int, 640) \
 	PO_DESC(defScreenH, int, 480) \
 	PO_DESC(windowTitle, std::string, "") \
+	PO_DESC(commonDataPath, std::string, "") \
 	PO_DESC(Modloader.ModsDirPath, std::string,"mods") \
 	PO_DESC(fixedFramerate, int, 0) \
 	PO_DESC(frameSkip, bool, true) \
@@ -92,7 +93,8 @@ void Config::read(int argc, char *argv[]){
 	PO_DESC(SE.sourceCount, int, 6) \
 	PO_DESC(pathCache, bool, true) \
 	PO_DESC(Windows_AllocConsole, bool, false) \
-	PO_DESC(Modloader.use_default_save_path, bool, false)
+	PO_DESC(Modloader.use_default_save_path, bool, false) \
+	PO_DESC(pancakes, bool, false)
 	
 // Not gonna take your shit boost
 #define GUARD_ALL( exp ) try { exp } catch(...) {}
@@ -170,6 +172,9 @@ void Config::read(int argc, char *argv[]){
 	gameFolder.append(SDL_GetAndroidInternalStoragePath()).append("/Sunshine");
 	#else
 	commonDataPath = prefPath(".", "Sunshine");
+	if(pancakes){
+		commonDataPath = prefPath(".", "Sunshine_Pancakes");
+	}
 	#endif
 
 	if(windowTitle == "")

src/config.h

@@ -35,6 +35,7 @@ struct Config{
 	bool Windows_AllocConsole;
 	bool smoothScaling;
 	bool vsync;
+	bool pancakes;
 	int defScreenW;
 	int defScreenH;
 	std::string windowTitle;