Merge remote-tracking branch 'upstream/master' into handlerhash-block

Data/Scripts/006_Game processing/002_Scene_Map.rb

@@ -0,0 +1,239 @@
+#===============================================================================
+# ** Modified Scene_Map class for Pokémon.
+#-------------------------------------------------------------------------------
+#
+#===============================================================================
+class Scene_Map
+  attr_reader :spritesetGlobal
+
+  def spriteset
+    for i in @spritesets.values
+      return i if i.map==$game_map
+    end
+    return @spritesets.values[0]
+  end
+
+  def createSpritesets
+    @spritesetGlobal = Spriteset_Global.new
+    @spritesets = {}
+    for map in $MapFactory.maps
+      @spritesets[map.map_id] = Spriteset_Map.new(map)
+    end
+    $MapFactory.setSceneStarted(self)
+    updateSpritesets
+  end
+
+  def createSingleSpriteset(map)
+    temp = $scene.spriteset.getAnimations
+    @spritesets[map] = Spriteset_Map.new($MapFactory.maps[map])
+    $scene.spriteset.restoreAnimations(temp)
+    $MapFactory.setSceneStarted(self)
+    updateSpritesets
+  end
+
+  def disposeSpritesets
+    return if !@spritesets
+    for i in @spritesets.keys
+      next if !@spritesets[i]
+      @spritesets[i].dispose
+      @spritesets[i] = nil
+    end
+    @spritesets.clear
+    @spritesets = {}
+    @spritesetGlobal.dispose
+    @spritesetGlobal = nil
+  end
+
+  def autofade(mapid)
+    playingBGM = $game_system.playing_bgm
+    playingBGS = $game_system.playing_bgs
+    return if !playingBGM && !playingBGS
+    map = pbLoadRxData(sprintf("Data/Map%03d",mapid))
+    if playingBGM && map.autoplay_bgm
+      if (PBDayNight.isNight? rescue false)
+        pbBGMFade(0.8) if playingBGM.name!=map.bgm.name && playingBGM.name!=map.bgm.name+"_n"
+      else
+        pbBGMFade(0.8) if playingBGM.name!=map.bgm.name
+      end
+    end
+    if playingBGS && map.autoplay_bgs
+      pbBGMFade(0.8) if playingBGS.name!=map.bgs.name
+    end
+    Graphics.frame_reset
+  end
+
+  def transfer_player(cancelVehicles=true)
+    $game_temp.player_transferring = false
+    pbCancelVehicles($game_temp.player_new_map_id) if cancelVehicles
+    autofade($game_temp.player_new_map_id)
+    pbBridgeOff
+    if $game_map.map_id!=$game_temp.player_new_map_id
+      $MapFactory.setup($game_temp.player_new_map_id)
+    end
+    $game_player.moveto($game_temp.player_new_x, $game_temp.player_new_y)
+    case $game_temp.player_new_direction
+    when 2; $game_player.turn_down
+    when 4; $game_player.turn_left
+    when 6; $game_player.turn_right
+    when 8; $game_player.turn_up
+    end
+    $game_player.straighten
+    $game_map.update
+    disposeSpritesets
+    GC.start
+    createSpritesets
+    if $game_temp.transition_processing
+      $game_temp.transition_processing = false
+      Graphics.transition(20)
+    end
+    $game_map.autoplay
+    Graphics.frame_reset
+    Input.update
+  end
+
+  def call_name
+    $game_temp.name_calling = false
+    $game_player.straighten
+    $game_map.update
+  end
+
+  def call_menu
+    $game_temp.menu_calling = false
+    $game_temp.in_menu = true
+    $game_player.straighten
+    $game_map.update
+    sscene = PokemonPauseMenu_Scene.new
+    sscreen = PokemonPauseMenu.new(sscene)
+    sscreen.pbStartPokemonMenu
+    $game_temp.in_menu = false
+  end
+
+  def call_debug
+    $game_temp.debug_calling = false
+    pbPlayDecisionSE
+    $game_player.straighten
+    pbFadeOutIn { pbDebugMenu }
+  end
+
+  def miniupdate
+    $PokemonTemp.miniupdate = true
+    loop do
+      updateMaps
+      $game_player.update
+      $game_system.update
+      $game_screen.update
+      break unless $game_temp.player_transferring
+      transfer_player
+      break if $game_temp.transition_processing
+    end
+    updateSpritesets
+    $PokemonTemp.miniupdate = false
+  end
+
+  def updateMaps
+    for map in $MapFactory.maps
+      map.update
+    end
+    $MapFactory.updateMaps(self)
+  end
+
+  def updateSpritesets
+    @spritesets = {} if !@spritesets
+    keys = @spritesets.keys.clone
+    for i in keys
+      if !$MapFactory.hasMap?(i)
+        @spritesets[i].dispose if @spritesets[i]
+        @spritesets[i] = nil
+        @spritesets.delete(i)
+      else
+        @spritesets[i].update
+      end
+    end
+    @spritesetGlobal.update
+    for map in $MapFactory.maps
+      @spritesets[map.map_id] = Spriteset_Map.new(map) if !@spritesets[map.map_id]
+    end
+    Events.onMapUpdate.trigger(self)
+  end
+
+  def update
+    loop do
+      updateMaps
+      pbMapInterpreter.update
+      $game_player.update
+      $game_system.update
+      $game_screen.update
+      break unless $game_temp.player_transferring
+      transfer_player
+      break if $game_temp.transition_processing
+    end
+    updateSpritesets
+    if $game_temp.to_title
+      $scene = pbCallTitle
+      return
+    end
+    if $game_temp.transition_processing
+      $game_temp.transition_processing = false
+      if $game_temp.transition_name == ""
+        Graphics.transition(20)
+      else
+        Graphics.transition(40, "Graphics/Transitions/" + $game_temp.transition_name)
+      end
+    end
+    return if $game_temp.message_window_showing
+    if !pbMapInterpreterRunning?
+      if Input.trigger?(Input::C)
+        $PokemonTemp.hiddenMoveEventCalling = true
+      elsif Input.trigger?(Input::B)
+        unless $game_system.menu_disabled or $game_player.moving?
+          $game_temp.menu_calling = true
+          $game_temp.menu_beep = true
+        end
+      elsif Input.trigger?(Input::F5)
+        unless $game_player.moving?
+          $PokemonTemp.keyItemCalling = true
+        end
+      elsif Input.trigger?(Input::A)
+        if $PokemonSystem.runstyle==1
+          $PokemonGlobal.runtoggle = !$PokemonGlobal.runtoggle
+        end
+      elsif Input.press?(Input::F9)
+        $game_temp.debug_calling = true if $DEBUG
+      end
+    end
+    unless $game_player.moving?
+      if $game_temp.name_calling;      call_name
+      elsif $game_temp.menu_calling;   call_menu
+      elsif $game_temp.debug_calling;  call_debug
+#      elsif $game_temp.battle_calling; call_battle
+#      elsif $game_temp.shop_calling;   call_shop
+#      elsif $game_temp.save_calling;   call_save
+      elsif $PokemonTemp.keyItemCalling
+        $PokemonTemp.keyItemCalling = false
+        $game_player.straighten
+        pbUseKeyItem
+      elsif $PokemonTemp.hiddenMoveEventCalling
+        $PokemonTemp.hiddenMoveEventCalling = false
+        $game_player.straighten
+        Events.onAction.trigger(self)
+      end
+    end
+  end
+
+  def main
+    createSpritesets
+    Graphics.transition(20)
+    loop do
+      Graphics.update
+      Input.update
+      update
+      break if $scene != self
+    end
+    Graphics.freeze
+    disposeSpritesets
+    if $game_temp.to_title
+      Graphics.transition(20)
+      Graphics.freeze
+    end
+  end
+end

Data/Scripts/006_Game processing/003_Event_Handlers.rb

@@ -0,0 +1,178 @@
+# Defines an event that procedures can subscribe to.
+class Event
+  def initialize
+    @callbacks = []
+  end
+
+  # Sets an event handler for this event and removes all other event handlers.
+  def set(method)
+    @callbacks.clear
+    @callbacks.push(method)
+  end
+
+  # Removes an event handler procedure from the event.
+  def -(method)
+    for i in 0...@callbacks.length
+      next if @callbacks[i]!=method
+      @callbacks.delete_at(i)
+      break
+    end
+    return self
+  end
+
+  # Adds an event handler procedure from the event.
+  def +(method)
+    for i in 0...@callbacks.length
+      return self if @callbacks[i]==method
+    end
+    @callbacks.push(method)
+    return self
+  end
+
+  # Clears the event of event handlers.
+  def clear
+    @callbacks.clear
+  end
+
+  # Triggers the event and calls all its event handlers.  Normally called only
+  # by the code where the event occurred.
+  # The first argument is the sender of the event, the second argument contains
+  # the event's parameters. If three or more arguments are given, this method
+  # supports the following callbacks:
+  # proc{ |sender,params| } where params is an array of the other parameters, and
+  # proc{ |sender,arg0,arg1,...| }
+  def trigger(*arg)
+    arglist = arg[1,arg.length]
+    for callback in @callbacks
+      if callback.arity>2 && arg.length==callback.arity
+        # Retrofitted for callbacks that take three or more arguments
+        callback.call(*arg)
+      else
+        callback.call(arg[0],arglist)
+      end
+    end
+  end
+
+  # Triggers the event and calls all its event handlers. Normally called only
+  # by the code where the event occurred. The first argument is the sender of
+  # the event, the other arguments are the event's parameters.
+  def trigger2(*arg)
+    for callback in @callbacks
+      callback.call(*arg)
+    end
+  end
+end
+
+
+
+class HandlerHash
+  def initialize(mod)
+    @mod         = mod
+    @hash        = {}
+    @addIfs      = []
+    @symbolCache = {}
+  end
+
+  def fromSymbol(sym)
+    return sym unless sym.is_a?(Symbol) || sym.is_a?(String)
+    mod = Object.const_get(@mod) rescue nil
+    return nil if !mod
+    return mod.const_get(sym.to_sym) rescue nil
+  end
+
+  def toSymbol(sym)
+    return sym.to_sym if sym.is_a?(Symbol) || sym.is_a?(String)
+    ret = @symbolCache[sym]
+    return ret if ret
+    mod = Object.const_get(@mod) rescue nil
+    return nil if !mod
+    for key in mod.constants
+      next if mod.const_get(key)!=sym
+      ret = key.to_sym
+      @symbolCache[sym] = ret
+      break
+    end
+    return ret
+  end
+
+  def addIf(conditionProc,handler=nil,&handlerBlock)
+    if ![Proc,Hash].include?(handler.class) && !block_given?
+      raise ArgumentError, "addIf call for #{self.class.name} has no valid handler (#{handler.inspect} was given)"
+    end
+    @addIfs.push([conditionProc,handler || handlerBlock])
+  end
+
+  def add(sym,handler=nil,&handlerBlock) # 'sym' can be an ID or symbol
+    if ![Proc,Hash].include?(handler.class) && !block_given?
+      raise ArgumentError, "#{self.class.name} for #{sym.inspect} has no valid handler (#{handler.inspect} was given)"
+    end
+    id = fromSymbol(sym)
+    @hash[id] = handler || handlerBlock if id
+    symbol = toSymbol(sym)
+    @hash[symbol] = handler || handlerBlock if symbol
+  end
+
+  def copy(src,*dests)
+    handler = self[src]
+    if handler
+      for dest in dests
+        self.add(dest,handler)
+      end
+    end
+  end
+
+  def [](sym)   # 'sym' can be an ID or symbol
+    id = fromSymbol(sym)
+    ret = nil
+    ret = @hash[id] if id && @hash[id]   # Real ID from the item
+    symbol = toSymbol(sym)
+    ret = @hash[symbol] if symbol && @hash[symbol]   # Symbol or string
+    unless ret
+      for addif in @addIfs
+        return addif[1] if addif[0].call(id)
+      end
+    end
+    return ret
+  end
+
+  def trigger(sym,*args)
+    handler = self[sym]
+    return (handler) ? handler.call(fromSymbol(sym),*args) : nil
+  end
+
+  def clear
+    @hash.clear
+  end
+end
+
+
+
+class SpeciesHandlerHash < HandlerHash
+  def initialize
+    super(:PBSpecies)
+  end
+end
+
+
+
+class AbilityHandlerHash < HandlerHash
+  def initialize
+    super(:PBAbilities)
+  end
+end
+
+
+
+class ItemHandlerHash < HandlerHash
+  def initialize
+    super(:PBItems)
+  end
+end
+
+
+
+class MoveHandlerHash < HandlerHash
+  def initialize
+    super(:PBMoves)
+  end
+end