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

2025-12-06 06:01:46 +00:00 · 2024-09-24 19:13:23 -04:00
parent 17aa9c7cb8 620a20e7f2
commit 425b00c317
16 changed files with 10497 additions and 299 deletions
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -5,8 +5,8 @@
 #==============================================================================#
 module Settings
  # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
-  GAME_VERSION = '6.2.3'
-  GAME_VERSION_NUMBER = "6.2.3"
+  GAME_VERSION = '6.2.4'
+  GAME_VERSION_NUMBER = "6.2.4"

  POKERADAR_LIGHT_ANIMATION_RED_ID = 17
  POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
@@ -49,7 +49,7 @@ module Settings
  PLAYER_SURFBASE_FOLDER = 'surf_base/'
  OW_SHINE_ANIMATION_ID=25

-  HTTP_CONFIGS_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/Scripts/RemoteUrls.rb"
+  HTTP_CONFIGS_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/pif-downloadables/refs/heads/master/Settings.rb"
  HTTP_CONFIGS_FILE_PATH = "Data/Scripts/DownloadedSettings.rb"

  LEVEL_CAPS=[12,22,26,35,38,45,51,54,62,62,63,64,64,65,67,68]
--- a/Data/Scripts/025-Randomizer/randomizer
+++ b/Data/Scripts/025-Randomizer/randomizer
@@ -228,10 +228,11 @@ def Kernel.sumGameStats()
  stringStats << "\nBeaten the Elite Four " << $game_variables[VAR_STAT_NB_ELITE_FOUR].to_s << " times"
  stringStats << "\nFused " << $game_variables[VAR_STAT_NB_FUSIONS].to_s << " Pokémon"

-  stringStats << "\nRematched " << $game_variables[VAR_STAT_LEADER_REMATCH].to_s << " Gym Leaders"
+  nbGymRematches = $game_variables[VAR_STAT_LEADER_REMATCH]
+  stringStats << "\nRematched " << nbGymRematches.to_s << " Gym Leaders" if nbGymRematches > 0
  stringStats << "\nTook " << $PokemonGlobal.stepcount.to_s << " steps"
  stringStats << "\nVisited " << countVisitedMaps.to_s << " different areas"
-  stringStats << "\nUsed " << $game_variables[VAR_STAT_RARE_CANDY] << " Rare Candies"
+  stringStats << "\nUsed " << $game_variables[VAR_STAT_RARE_CANDY].to_s << " Rare Candies"

  if $game_switches[910]
    stringStats << "\nMade " << $game_variables[VAR_STAT_NB_WONDERTRADES].to_s << " Wonder Trades"
--- a/Data/Scripts/051_AddOns/BetterRegionMap.rb
+++ b/Data/Scripts/051_AddOns/BetterRegionMap.rb
@@ -107,13 +107,12 @@ class BetterRegionMap
      if map_metadata
        player = map_metadata.town_map_position
        if true#player && player[0] == @region  #only use 1 region
-          $PokemonGlobal.regionMapSel[0] = player[1]
-          $PokemonGlobal.regionMapSel[1] = player[2]
+          $PokemonGlobal.regionMapSel = [0, 0]
          gender = $Trainer.gender.to_digits(3)
          # @window["player"].bmp("Graphics/Pictures/map/Player#{gender}")
          @window["player"].bmp("Graphics/Pictures/map/location_icon")
-          @window["player"].x = TileWidth * player[1] + (TileWidth / 2.0)
-          @window["player"].y = TileHeight * player[2] + (TileHeight / 2.0)
+          @window["player"].x = TileWidth * player[1] + (TileWidth / 2.0) if player
+          @window["player"].y = TileHeight * player[2] + (TileHeight / 2.0)  if player
          @window["player"].center_origins
        end
      else
--- a/Data/Scripts/051_AddOns/HttpCalls.rb
+++ b/Data/Scripts/051_AddOns/HttpCalls.rb
@@ -40,7 +40,7 @@ def download_file(url, saveLocation)
      echoln _INTL("\nDownloaded file {1} to {2}", url, saveLocation)
      return saveLocation
    else
-      echoln _INTL("Tried to download file {1} . Got response  {2}",url,response[:body])
+      echoln _INTL("Tried to download file {1}.",url)
    end
    return nil
  rescue MKXPError, Errno::ENOENT => error
@@ -81,7 +81,7 @@ def download_sprite(base_path, head_id, body_id, saveLocation = "Graphics/temp",
      echoln _INTL("\nDownloaded file from {1} to {2}", base_path, saveLocation)
      return downloaded_file_name
    end
-    echoln "tried to download " + url
+    echoln _INTL("Tried to download file {1} . Got response  {2}",url,response[:body])
    return nil
  rescue MKXPError, Errno::ENOENT
    return nil
--- a/Data/Scripts/051_AddOns/ShinyColorOffsets.rb
+++ b/Data/Scripts/051_AddOns/ShinyColorOffsets.rb
@@ -1,3 +1,47 @@
+# class ShinySelector
+#   def set_colors(pokemon_id)
+#
+#
+#
+#     picturePath = get_unfused_sprite_path(getPokemon(pokemon_id).id_number)
+#     @pokemonBitmap = AnimatedBitmap.new(picturePath)
+#     @previewwindow = PictureWindow.new(@pokemonBitmap)
+#     @previewwindow.z = 100
+#
+#
+#
+#     pbFadeOutIn {
+#       scene = ShinySliderOptionsScene.new
+#       screen = PokemonOptionScreen.new(scene)
+#       screen.pbStartScreen
+#     }
+#
+#   end
+# end
+#
+# class ShinySliderOptionsScene < PokemonOption_Scene
+#   def pbGetOptions(inloadscreen = false)
+#     options = []
+#     options << SliderOption.new(_INTL("Hue"), 0, 360, 1,
+#                                 proc { $game_variables[VAR_RANDOMIZER_TRAINER_BST] },
+#                                 proc { |value|
+#                                   $game_variables[VAR_RANDOMIZER_TRAINER_BST] = value
+#                                 })
+#   end
+#
+#   def initOptionsWindow
+#     options = []
+#     options << SliderOption.new(_INTL("Hue"), 0, 360, 1,
+#                                 proc { $game_variables[VAR_RANDOMIZER_TRAINER_BST] },
+#                                 proc { |value|
+#                                   $game_variables[VAR_RANDOMIZER_TRAINER_BST] = value
+#                                 })
+#     return Window_PokemonOption.new(options, 0, 300, Graphics.width, Graphics.height)
+#   end
+# end
+
+
+
 SHINY_COLOR_OFFSETS = {
  1 => -30,
  2 => -85,
--- a/Data/Scripts/DownloadedSettings.rb
+++ b/Data/Scripts/DownloadedSettings.rb
@@ -1,15 +1,15 @@

 module Settings
  SHINY_POKEMON_CHANCE = 16
-  CREDITS_FILE_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/Sprite Credits.csv"
+  CREDITS_FILE_URL = "https://gitlab.com/infinitefusion2/customsprites/-/raw/master/Sprite Credits.csv"
  SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/CUSTOM_SPRITES"
  VERSION_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/VERSION"
  CUSTOM_DEX_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/dex.json"

-  AUTOGEN_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/autogen-fusion-sprites/-/raw/master/Battlers/"
-  CUSTOM_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/CustomBattlers/"
-  BASE_POKEMON_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/autogen-fusion-sprites/-/raw/master/Battlers/"
-  BASE_POKEMON_ALT_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/Other/BaseSprites/"
+  AUTOGEN_SPRITES_REPO_URL = "https://gitlab.com/infinitefusion2/autogen-fusion-sprites/-/raw/main/Battlers/"
+  CUSTOM_SPRITES_REPO_URL = "https://gitlab.com/infinitefusion2/customSprites/-/raw/master/CustomBattlers/"
+  BASE_POKEMON_SPRITES_REPO_URL = "https://gitlab.com/infinitefusion2/autogen-fusion-sprites/-/raw/main/Battlers/"
+  BASE_POKEMON_ALT_SPRITES_REPO_URL = "https://gitlab.com/infinitefusion2/customSprites/-/raw/main/Other/BaseSprites/"

  DISCORD_URL = "https://discord.com/invite/infinitefusion"
  WIKI_URL = "https://infinitefusion.fandom.com/"
--- a/Data/Scripts/RemoteUrls.rb
+++ b/Data/Scripts/RemoteUrls.rb
@@ -1,16 +0,0 @@
-
-module Settings
-  SHINY_POKEMON_CHANCE = 16
-  CREDITS_FILE_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/Sprite Credits.csv"
-  SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/CUSTOM_SPRITES"
-  VERSION_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/VERSION"
-  CUSTOM_DEX_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/dex.json"
-
-  AUTOGEN_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/autogen-fusion-sprites/-/raw/master/Battlers/"
-  CUSTOM_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/CustomBattlers/"
-  BASE_POKEMON_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/autogen-fusion-sprites/-/raw/master/Battlers/"
-  BASE_POKEMON_ALT_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/Other/BaseSprites/"
-
-  DISCORD_URL = "https://discord.com/invite/infinitefusion"
-  WIKI_URL = "https://infinitefusion.fandom.com/"
-end