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

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.4'
-  GAME_VERSION_NUMBER = "6.2.4"
+  GAME_VERSION = '6.2.3'
+  GAME_VERSION_NUMBER = "6.2.3"
 
   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/pif-downloadables/refs/heads/master/Settings.rb"
+  HTTP_CONFIGS_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/Scripts/RemoteUrls.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]

Data/Scripts/012_Overworld/002_Battle triggering/005_Overworld_RoamingPokemon.rb

@@ -74,7 +74,9 @@ def applyRoamWeather()
   return if $game_screen.weather_type != :None
   currently_roaming = getAllCurrentlyRoamingPokemon()
   currently_roaming.each do |roamer_id|
-    roamerOnCurrentMap = $PokemonGlobal.roamPosition[roamer_id] == $game_map.map_id
+    roamer_switch = Settings::ROAMING_SPECIES[roamer_id][2]
+    roamer_active = $game_switches[roamer_switch]
+    roamerOnCurrentMap = $PokemonGlobal.roamPosition[roamer_id] == $game_map.map_id && roamer_active
     if roamerOnCurrentMap
       return if $PokemonGlobal.roamPokemonCaught[roamer_id]
       weather = Settings::ROAMING_SPECIES[roamer_id][6]

Data/Scripts/025-Randomizer/randomizer gym leader edit.rb

@@ -228,11 +228,10 @@ 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"
 
-  nbGymRematches = $game_variables[VAR_STAT_LEADER_REMATCH]
-  stringStats << "\nRematched " << nbGymRematches.to_s << " Gym Leaders" if nbGymRematches > 0
+  stringStats << "\nRematched " << $game_variables[VAR_STAT_LEADER_REMATCH].to_s << " Gym Leaders"
   stringStats << "\nTook " << $PokemonGlobal.stepcount.to_s << " steps"
   stringStats << "\nVisited " << countVisitedMaps.to_s << " different areas"
-  stringStats << "\nUsed " << $game_variables[VAR_STAT_RARE_CANDY].to_s << " Rare Candies"
+  stringStats << "\nUsed " << $game_variables[VAR_STAT_RARE_CANDY] << " Rare Candies"
 
   if $game_switches[910]
     stringStats << "\nMade " << $game_variables[VAR_STAT_NB_WONDERTRADES].to_s << " Wonder Trades"

Data/Scripts/051_AddOns/BetterRegionMap.rb

@@ -107,12 +107,13 @@ class BetterRegionMap
       if map_metadata
         player = map_metadata.town_map_position
         if true#player && player[0] == @region  #only use 1 region
-          $PokemonGlobal.regionMapSel = [0, 0]
+          $PokemonGlobal.regionMapSel[0] = player[1]
+          $PokemonGlobal.regionMapSel[1] = player[2]
           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) if player
-          @window["player"].y = TileHeight * player[2] + (TileHeight / 2.0)  if player
+          @window["player"].x = TileWidth * player[1] + (TileWidth / 2.0)
+          @window["player"].y = TileHeight * player[2] + (TileHeight / 2.0)
           @window["player"].center_origins
         end
       else

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}.",url)
+      echoln _INTL("Tried to download file {1} . Got response  {2}",url,response[:body])
     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 _INTL("Tried to download file {1} . Got response  {2}",url,response[:body])
+    echoln "tried to download " + url
     return nil
   rescue MKXPError, Errno::ENOENT
     return nil

Data/Scripts/051_AddOns/ShinyColorOffsets.rb

@@ -1,47 +1,3 @@
-# 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,

Data/Scripts/DownloadedSettings.rb

@@ -1,15 +1,15 @@
 
 module Settings
   SHINY_POKEMON_CHANCE = 16
-  CREDITS_FILE_URL = "https://gitlab.com/infinitefusion2/customsprites/-/raw/master/Sprite Credits.csv"
+  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/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/"
+  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/"

Data/Scripts/RemoteUrls.rb

@@ -0,0 +1,16 @@
+
+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

Game.rxproj

@@ -1 +0,0 @@
-RPGXP 1.01