Merge remote-tracking branch 'mathewv/master'

scripts/Desktop_Message.rb

@@ -176,6 +176,13 @@ class Desktop_Message
       return
     end
 
+    if visible
+      if Input.trigger?(Input::ACTION) || Input.trigger?(Input::CANCEL)
+        terminate_message
+        @fade_out = true
+      end
+    end
+
     # Message is over and should be hidden or advanced to next
     if $game_temp.message_desktop_text == nil
       @fade_out = true if @viewport.visible
@@ -189,12 +196,6 @@ class Desktop_Message
       end
     end
 
-    if visible
-      if Input.trigger?(Input::ACTION) || Input.trigger?(Input::CANCEL)
-        terminate_message
-        @fade_out = true
-      end
-    end
   end
   #--------------------------------------------------------------------------
   # * Variables

scripts/Doc_Message.rb

@@ -191,6 +191,13 @@ class Doc_Message
       return
     end
 
+    if visible
+      if Input.trigger?(Input::ACTION) || Input.trigger?(Input::CANCEL)
+        terminate_message
+        @fade_out = true
+      end
+    end
+
     # Message is over and should be hidden or advanced to next
     if $game_temp.message_doc_text == nil
       @fade_out = true if @viewport.visible
@@ -204,12 +211,6 @@ class Doc_Message
       end
     end
 
-    if visible
-      if Input.trigger?(Input::ACTION) || Input.trigger?(Input::CANCEL)
-        terminate_message
-        @fade_out = true
-      end
-    end
   end
   #--------------------------------------------------------------------------
   # * Variables

scripts/EdText.rb

@@ -3,7 +3,6 @@ module EdText
     Oneshot.msgbox Oneshot::Msg::YESNO, tr("Do you understand what this means?")
   end
   def self.info(text)
-    timestart = Time.now
     if(Graphics.fullscreen == true)
 	  Graphics.fullscreen = false
 	  $console = false
@@ -12,10 +11,9 @@ module EdText
 	Graphics.update
     text.gsub!("\\p", $game_oneshot.player_name)
     Oneshot.msgbox Oneshot::Msg::INFO, tr(text)
-    $game_temp.prompt_wait = ((Time.now - timestart) * 60).round
+    Graphics.frame_reset
   end
   def self.yesno(text)
-    timestart = Time.now
     if(Graphics.fullscreen == true)
 	  Graphics.fullscreen = false
 	  $console = false
@@ -24,11 +22,10 @@ module EdText
 	Graphics.update
     text.gsub!("\\p", $game_oneshot.player_name)
     result = Oneshot.msgbox Oneshot::Msg::YESNO, tr(text)
-    $game_temp.prompt_wait = ((Time.now - timestart) * 60).round
+    Graphics.frame_reset
     return result
   end
   def self.err(text)
-    timestart = Time.now
     if(Graphics.fullscreen == true)
 	  Graphics.fullscreen = false
 	  $console = false
@@ -37,7 +34,7 @@ module EdText
 	Graphics.update
     text.gsub!("\\p", $game_oneshot.player_name)
     result = Oneshot.msgbox Oneshot::Msg::ERR, tr(text)
-    $game_temp.prompt_wait = ((Time.now - timestart) * 60).round
+    Graphics.frame_reset
     return result
   end
 end

scripts/Ed_Message.rb

@@ -179,6 +179,13 @@ class Ed_Message
       return
     end
 
+    if visible
+      if Input.trigger?(Input::ACTION) || Input.trigger?(Input::CANCEL)
+        terminate_message
+        @fade_out_text = true
+      end
+    end
+
     # Message is over and should be hidden or advanced to next
     if $game_temp.message_ed_text == nil
       @fade_out = true if @viewport.visible
@@ -213,12 +220,6 @@ class Ed_Message
       return
     end
 
-    if visible
-      if Input.trigger?(Input::ACTION) || Input.trigger?(Input::CANCEL)
-        terminate_message
-        @fade_out_text = true
-      end
-    end
   end
   #--------------------------------------------------------------------------
   # * Variables

scripts/Game_Player.rb

@@ -175,7 +175,7 @@ class Game_Player < Game_Character
     # If moving, event running, move route forcing, and message window
     # display are all not occurring
     unless $game_system.map_interpreter.running? or @move_route_forcing or
-           $game_temp.message_window_showing
+           $game_temp.message_window_showing or $game_temp.menus_visible
       # Adjust move speed
       @move_speed = Input.press?(Input::RUN) ? 4 : 3
       unless moving?
@@ -235,7 +235,7 @@ class Game_Player < Game_Character
       end
     end
     # If not moving
-    unless moving?
+    unless moving? or $game_temp.menus_visible
       # If player was moving last time
       if last_moving
         # Event determinant is via touch of same position event

scripts/Game_Temp.rb

@@ -63,6 +63,7 @@ class Game_Temp
   attr_accessor :footstep_sfx             # current footstep sfx array
   attr_accessor :filmsprite               # film puzzle sprite
   attr_accessor :prompt_wait              # wait for delay caused by prompt
+  attr_accessor :menus_visible
   #--------------------------------------------------------------------------
   # * Object Initialization
   #--------------------------------------------------------------------------
@@ -119,6 +120,7 @@ class Game_Temp
     @footstep_sfx = nil
     @filmsprite = nil
     @prompt_wait = 0
+	@menus_visible = false
   end
 
   def bgm_fadein(game_system)

scripts/Interpreter 5.rb

@@ -363,6 +363,8 @@ class Interpreter
   #--------------------------------------------------------------------------
   def command_241
     # Play BGM
+    $game_temp.target_bgm_vol_level = -1
+    $game_temp.bgm_fadein_speed = 99
     $game_system.bgm_play(@parameters[0])
     # Continue
     return true
@@ -372,6 +374,8 @@ class Interpreter
   #--------------------------------------------------------------------------
   def command_242
     # Fade out BGM
+    $game_temp.target_bgm_vol_level = -1
+    $game_temp.bgm_fadein_speed = 99
     $game_system.bgm_fade(@parameters[0])
     # Continue
     return true

scripts/Scene_Map.rb

@@ -118,7 +118,8 @@ class Scene_Map
         return
       end
       $game_system.map_interpreter.update
-      $game_player.update if !@menu.visible && !@item_menu.visible && !@fast_travel.visible
+	  $game_temp.menus_visible = @menu.visible || @item_menu.visible || @fast_travel.visible
+      $game_player.update
       $game_followers.each{|f| f.update}
       # Update system (timer), screen
       $game_system.update

scripts/Script.rb

@@ -128,6 +128,15 @@ module Script
     return 0
   end
 
+  def self.countdown_over
+    equinox = Time.new(2017, 03, 20)
+	diff = equinox - Time.now
+	if(diff <= 0)
+	  return true
+	end
+	return false
+  end
+
   def self.countdown_update
     equinox = Time.new(2017, 03, 20)
 	diff = equinox - Time.now