Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
620a20e7f2 | ||
|
|
56e1cc5e5d | ||
|
|
f76ea4db46 | ||
|
|
ffd3a95e08 | ||
|
|
30f42847de | ||
|
|
6f69768db6 | ||
|
|
f27961a805 | ||
|
|
0d9741a460 | ||
|
|
3326daaaab | ||
|
|
cc26deeb33 | ||
|
|
a8ab419036 | ||
|
|
ba04d37b87 | ||
|
|
aac5fd911a | ||
|
|
9e80ff92ec |
4540
Data/CUSTOM_SPRITES
@@ -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]
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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/"
|
||||
|
||||
@@ -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
|
||||
6164
Data/dex.json
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 771 B After Width: | Height: | Size: 783 B |
|
Before Width: | Height: | Size: 1021 B After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 480 B After Width: | Height: | Size: 407 B |
|
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 802 B |
|
Before Width: | Height: | Size: 993 B After Width: | Height: | Size: 798 B |
|
Before Width: | Height: | Size: 516 B After Width: | Height: | Size: 544 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 727 B |
|
Before Width: | Height: | Size: 494 B After Width: | Height: | Size: 387 B |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 409 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 899 B |
|
Before Width: | Height: | Size: 517 B After Width: | Height: | Size: 409 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 537 B After Width: | Height: | Size: 571 B |
|
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 293 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 895 B |
|
Before Width: | Height: | Size: 485 B After Width: | Height: | Size: 376 B |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 949 B |
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 382 B |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 545 B |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 861 B |
|
Before Width: | Height: | Size: 793 B After Width: | Height: | Size: 382 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 987 B |
|
Before Width: | Height: | Size: 494 B After Width: | Height: | Size: 387 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1016 B |
|
Before Width: | Height: | Size: 518 B After Width: | Height: | Size: 422 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 516 B After Width: | Height: | Size: 377 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 996 B |
|
Before Width: | Height: | Size: 476 B After Width: | Height: | Size: 376 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 489 B After Width: | Height: | Size: 518 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 953 B |
|
Before Width: | Height: | Size: 477 B After Width: | Height: | Size: 376 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 442 B After Width: | Height: | Size: 426 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 465 B After Width: | Height: | Size: 426 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 979 B |
|
Before Width: | Height: | Size: 470 B After Width: | Height: | Size: 382 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 956 B |
|
Before Width: | Height: | Size: 495 B After Width: | Height: | Size: 381 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 494 B After Width: | Height: | Size: 383 B |
|
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 842 B |
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 388 B |
|
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 480 B After Width: | Height: | Size: 444 B |
|
Before Width: | Height: | Size: 923 B After Width: | Height: | Size: 740 B |
|
Before Width: | Height: | Size: 464 B After Width: | Height: | Size: 392 B |
|
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 885 B |
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 540 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1003 B |
|
Before Width: | Height: | Size: 503 B After Width: | Height: | Size: 396 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 937 B |
|
Before Width: | Height: | Size: 482 B After Width: | Height: | Size: 389 B |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 880 B |
|
Before Width: | Height: | Size: 881 B After Width: | Height: | Size: 373 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 491 B After Width: | Height: | Size: 558 B |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 383 B |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 927 B |
|
Before Width: | Height: | Size: 727 B After Width: | Height: | Size: 383 B |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 972 B |
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 391 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 867 B |
|
Before Width: | Height: | Size: 480 B After Width: | Height: | Size: 373 B |
BIN
Graphics/Battle animations/ball_STATUSBALLb.png
Normal file
|
After Width: | Height: | Size: 898 B |
BIN
Graphics/Battle animations/ball_STATUSBALLb_open.png
Normal file
|
After Width: | Height: | Size: 415 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 958 B |
|
Before Width: | Height: | Size: 482 B After Width: | Height: | Size: 371 B |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 1009 B |
|
Before Width: | Height: | Size: 7.9 KiB After Width: | Height: | Size: 382 B |
|
Before Width: | Height: | Size: 8.9 KiB After Width: | Height: | Size: 1000 B |
|
Before Width: | Height: | Size: 699 B After Width: | Height: | Size: 377 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 496 B After Width: | Height: | Size: 732 B |
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 996 B |
|
Before Width: | Height: | Size: 835 B After Width: | Height: | Size: 391 B |
|
Before Width: | Height: | Size: 481 B After Width: | Height: | Size: 297 B |
|
Before Width: | Height: | Size: 493 B After Width: | Height: | Size: 274 B |