Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases

Data/Scripts/001_Settings.rb

@@ -6,7 +6,7 @@
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
   GAME_VERSION = '5.0.0'
-  GAME_VERSION_NUMBER = "5.3.0.6"
+  GAME_VERSION_NUMBER = "5.3.0.7"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18

Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb

@@ -741,6 +741,7 @@ class SpriteWindow_Selectable < SpriteWindow_Base
     @row_height = 32
     @column_spacing = 32
     @ignore_input = false
+    @allow_arrows_jump=false
   end
 
   def itemCount
@@ -767,6 +768,10 @@ class SpriteWindow_Selectable < SpriteWindow_Base
     end
   end
 
+  def setAllowArrowsJump(value)
+    @allow_arrows_jump=value
+  end
+
   def columns
     return @column_max || 1
   end
@@ -848,63 +853,89 @@ class SpriteWindow_Selectable < SpriteWindow_Base
     super
     if self.active && @item_max > 0 && @index >= 0 && !@ignore_input
       if Input.repeat?(Input::UP)
-        if @index >= @column_max ||
-           (Input.trigger?(Input::UP) && (@item_max % @column_max)==0)
-          oldindex = @index
-          @index = (@index - @column_max + @item_max) % @item_max
-          if @index!=oldindex
-            pbPlayCursorSE()
-            update_cursor_rect
-          end
-        end
+        scroll_up()
       elsif Input.repeat?(Input::DOWN)
-        if @index < @item_max - @column_max ||
-           (Input.trigger?(Input::DOWN) && (@item_max % @column_max)==0)
-          oldindex = @index
-          @index = (@index + @column_max) % @item_max
-          if @index!=oldindex
-            pbPlayCursorSE()
-            update_cursor_rect
-          end
-        end
-      elsif Input.repeat?(Input::LEFT)
-        if @column_max >= 2 && @index > 0
-          oldindex = @index
-          @index -= 1
-          if @index!=oldindex
-            pbPlayCursorSE()
-            update_cursor_rect
-          end
-        end
-      elsif Input.repeat?(Input::RIGHT)
-        if @column_max >= 2 && @index < @item_max - 1
-          oldindex = @index
-          @index += 1
-          if @index!=oldindex
-            pbPlayCursorSE()
-            update_cursor_rect
-          end
-        end
-      elsif Input.repeat?(Input::JUMPUP)
-        if @index > 0
-          oldindex = @index
-          @index = [self.index-self.page_item_max, 0].max
-          if @index!=oldindex
-            pbPlayCursorSE()
-            self.top_row -= self.page_row_max
-            update_cursor_rect
-          end
-        end
-      elsif Input.repeat?(Input::JUMPDOWN)
-        if @index < @item_max-1
-          oldindex = @index
-          @index = [self.index+self.page_item_max, @item_max-1].min
-          if @index!=oldindex
-            pbPlayCursorSE()
-            self.top_row += self.page_row_max
-            update_cursor_rect
-          end
-        end
+        scroll_down()
+      elsif Input.repeat?(Input::LEFT) && !@allow_arrows_jump
+        scroll_left()
+      elsif Input.repeat?(Input::RIGHT) && !@allow_arrows_jump
+        scroll_right()
+      elsif Input.repeat?(Input::JUMPUP) || (Input.repeat?(Input::LEFT) && @allow_arrows_jump)
+        jump_up()
+      elsif Input.repeat?(Input::JUMPDOWN) || (Input.repeat?(Input::RIGHT) && @allow_arrows_jump)
+        jump_down()
+      end
+    end
+  end
+
+  def scroll_up()
+    if @index >= @column_max ||
+      (Input.trigger?(Input::UP) && (@item_max % @column_max)==0)
+      oldindex = @index
+      @index = (@index - @column_max + @item_max) % @item_max
+      if @index!=oldindex
+        pbPlayCursorSE()
+        update_cursor_rect
+      end
+    end
+  end
+
+  def scroll_down()
+    if @index < @item_max - @column_max ||
+      (Input.trigger?(Input::DOWN) && (@item_max % @column_max)==0)
+      oldindex = @index
+      @index = (@index + @column_max) % @item_max
+      if @index!=oldindex
+        pbPlayCursorSE()
+        update_cursor_rect
+      end
+    end
+  end
+
+  def scroll_left()
+    if @column_max >= 2 && @index < @item_max - 1
+      oldindex = @index
+      @index += 1
+      if @index!=oldindex
+        pbPlayCursorSE()
+        update_cursor_rect
+      end
+    end
+  end
+
+  def scroll_right()
+    if @column_max >= 2 && @index > 0
+      oldindex = @index
+      @index -= 1
+      if @index!=oldindex
+        pbPlayCursorSE()
+        update_cursor_rect
+      end
+    end
+  end
+
+
+  def jump_up()
+    if @index > 0
+      oldindex = @index
+      @index = [self.index-self.page_item_max, 0].max
+      if @index!=oldindex
+        pbPlayCursorSE()
+        self.top_row -= self.page_row_max
+        update_cursor_rect
+      end
+    end
+  end
+
+
+  def jump_down()
+    if @index < @item_max-1
+      oldindex = @index
+      @index = [self.index+self.page_item_max, @item_max-1].min
+      if @index!=oldindex
+        pbPlayCursorSE()
+        self.top_row += self.page_row_max
+        update_cursor_rect
       end
     end
   end

Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb

@@ -588,6 +588,9 @@ class PokemonEvolutionScene
     end
     # Success jingle/message
     pbMEPlay("Evolution success")
+    sprite_bitmap=@sprites["rsprite2"].getBitmap
+    drawSpriteCredits(sprite_bitmap.filename,sprite_bitmap.path, @viewport)
+
     newspeciesname = GameData::Species.get(@newspecies).name
     if !reversing
       pbMessageDisplay(@sprites["msgwindow"],
@@ -599,6 +602,7 @@ class PokemonEvolutionScene
                              @pokemon.name,newspeciesname)) { pbUpdate }
     end
 
+
     @sprites["msgwindow"].text = ""
     # Check for consumed item and check if Pokémon should be duplicated
     pbEvolutionMethodAfterEvolution if !reversing

Data/Scripts/016_UI/003_UI_Pokedex_Main.rb

@@ -8,6 +8,7 @@ class Window_Pokedex < Window_DrawableCommand
     @selarrow     = AnimatedBitmap.new("Graphics/Pictures/Pokedex/cursor_list")
     @pokeballOwn  = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_own")
     @pokeballSeen = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_seen")
+    @allow_arrows_jump=true
     self.baseColor   = Color.new(88,88,80)
     self.shadowColor = Color.new(168,184,184)
     self.windowskin  = nil

Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb

@@ -113,9 +113,14 @@ class PokemonPokedexInfo_Scene
     @sprites["infosprite"].x = 104
     @sprites["infosprite"].y = 136
     @sprites["overlay"] = BitmapSprite.new(Graphics.width,Graphics.height,@viewport)
-    pbSetSystemFont(@sprites["overlay"].bitmap)
-    pbUpdateDummyPokemon
-    drawPage(@page)
+
+
+
+  pbSetSystemFont(@sprites["overlay"].bitmap)
+  pbUpdateDummyPokemon
+  drawPage(@page)
+  sprite_bitmap= @sprites["infosprite"].getBitmap
+
     pbFadeInAndShow(@sprites) { pbUpdate }
   end
 

Data/Scripts/016_UI/015_UI_Options.rb

@@ -196,9 +196,10 @@ class Window_PokemonOption < Window_DrawableCommand
     @selBaseColor = Color.new(31 * 8, 6 * 8, 3 * 8)
     @selShadowColor = Color.new(31 * 8, 17 * 8, 16 * 8)
     @optvalues = []
-    @mustUpdateOptions = false
+  @mustUpdateOptions = false
     @mustUpdateDescription = false
     @selected_position = 0
+    @allow_arrows_jump=false
     for i in 0...@options.length
       @optvalues[i] = 0
     end

Data/Scripts/020_Debug/003_Editor_Listers.rb

@@ -3,6 +3,7 @@
 #===============================================================================
 def pbListWindow(cmds, width = Graphics.width / 2)
   list = Window_CommandPokemon.newWithSize(cmds, 0, 0, width, Graphics.height)
+  list.setAllowArrowsJump(true)
   list.index     = 0
   list.rowHeight = 24
   pbSetSmallFont(list.contents)

Data/Scripts/048_Fusion/PokemonFusion.rb

@@ -691,7 +691,7 @@ class PokemonFusionScene
       overlay = BitmapSprite.new(Graphics.width, Graphics.height, @viewport).bitmap
 
       sprite_bitmap = @sprites["rsprite2"].getBitmap
-      drawSpriteCredits(sprite_bitmap.filename,sprite_bitmap.path, overlay)
+      drawSpriteCredits(sprite_bitmap.filename,sprite_bitmap.path, @viewport)
       Kernel.pbMessageDisplay(@sprites["msgwindow"],
                               _INTL("\\se[]Congratulations! Your Pokémon were fused into {2}!\\wt[80]", @pokemon1.name, newspeciesname))
 
@@ -770,7 +770,9 @@ class PokemonFusionScene
   end
 end
 
-def drawSpriteCredits(filename,path,overlay)
+def drawSpriteCredits(filename,path,viewport)
+  overlay = BitmapSprite.new(Graphics.width, Graphics.height, @viewport).bitmap
+
   return if path.start_with?(Settings::BATTLERS_FOLDER)
   x= Graphics.width/2
   y=240

Data/Scripts/050_AddOns/GuessPokemonQuiz.rb

@@ -50,7 +50,7 @@ class FusionQuiz
           prompt_quit = pbMessage(_INTL("You still have {1} rounds to go. You'll only keep your points if you finish all {2} rounds. Do you really want to quit now?", rounds_left, nb_rounds), ["Yes", "No"])
           if prompt_quit
             @abandonned = true
-            return
+            break
           end
         end
         round_multiplier += round_multiplier_increase
@@ -63,12 +63,14 @@ class FusionQuiz
   end
 
   def end_quiz()
+    hide_fusion_picture
     Kernel.pbClearText()
     previous_highest = pbGet(VAR_STAT_FUSION_QUIZ_HIGHEST_SCORE)
     pbSet(VAR_STAT_FUSION_QUIZ_HIGHEST_SCORE,@score) if @score > previous_highest
 
     previous_total = pbGet(VAR_STAT_FUSION_QUIZ_TOTAL_PTS)
     pbSet(VAR_STAT_FUSION_QUIZ_TOTAL_PTS,previous_total+@score)
+    dispose
   end
 
   def start_quiz_new_round(round_multiplier = 1)