mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Fixes an issue causing checks for rate limiting to be counted
This commit is contained in:
@@ -107,8 +107,8 @@ module Settings
|
||||
BASE_POKEMON_SPRITESHEET_URL = "https://infinitefusion.net/spritesheets/spritesheets_base/"
|
||||
CUSTOM_FUSIONS_SPRITESHEET_URL = "https://infinitefusion.net/spritesheets/spritesheets_custom/"
|
||||
|
||||
BASE_POKEMON_SPRITESHEET_TRUE_SIZE_URL = "https://infinitefusion.net/spritesheets_truesize/spritesheets_base/"
|
||||
CUSTOM_FUSIONS_SPRITESHEET_TRUE_SIZE_URL = "https://infinitefusion.net/spritesheets_truesize/spritesheets_custom/"
|
||||
BASE_POKEMON_SPRITESHEET_TRUE_SIZE_URL = ""
|
||||
CUSTOM_FUSIONS_SPRITESHEET_TRUE_SIZE_URL = ""
|
||||
|
||||
RIVAL_STARTER_PLACEHOLDER_SPECIES = :MEW #(MEW)
|
||||
VAR_1_PLACEHOLDER_SPECIES = :DIALGA
|
||||
|
||||
@@ -115,7 +115,6 @@ end
|
||||
|
||||
class PokeBattle_Move_034 # Minimize
|
||||
alias __clauses__pbMoveFailed? pbMoveFailed? unless method_defined?(:__clauses__pbFailsAgainstTarget?)
|
||||
|
||||
def pbMoveFailed?(user,targets)
|
||||
if !damagingMove? && @battle.rules["evasionclause"]
|
||||
@battle.pbDisplay(_INTL("But it failed!"))
|
||||
|
||||
@@ -464,6 +464,7 @@ class PokemonPokedexInfo_Scene
|
||||
end
|
||||
end
|
||||
|
||||
#unused
|
||||
def getAIDexEntry(pokemonID, name)
|
||||
begin
|
||||
head_number = get_head_number_from_symbol(pokemonID).to_s
|
||||
|
||||
@@ -68,7 +68,7 @@ class BattleSpriteLoader
|
||||
def obtain_fusion_pif_sprite(head_id,body_id)
|
||||
substitution_id = get_sprite_substitution_id_for_fusion(head_id, body_id)
|
||||
pif_sprite = $PokemonGlobal.alt_sprite_substitutions[substitution_id] if $PokemonGlobal
|
||||
pif_sprite.dump_info if pif_sprite
|
||||
#pif_sprite.dump_info if pif_sprite
|
||||
if !pif_sprite
|
||||
pif_sprite = select_new_pif_fusion_sprite(head_id, body_id)
|
||||
local_path = check_for_local_sprite(pif_sprite)
|
||||
|
||||
@@ -86,7 +86,7 @@ end
|
||||
|
||||
def download_spritesheet(pif_sprite, dest)
|
||||
#return nil if requestRateExceeded?(Settings::CUSTOMSPRITES_RATE_LOG_FILE,Settings::CUSTOMSPRITES_ENTRIES_RATE_TIME_WINDOW,Settings::CUSTOMSPRITES_RATE_MAX_NB_REQUESTS)
|
||||
return nil if requestRateExceeded?(Settings::CUSTOMSPRITES_RATE_LOG_FILE, 60, 15)
|
||||
return nil if requestRateExceeded?(Settings::CUSTOMSPRITES_RATE_LOG_FILE, 60, 15,false)
|
||||
case pif_sprite.type
|
||||
when :AUTOGEN
|
||||
return
|
||||
|
||||
@@ -185,7 +185,7 @@ class PokemonPokedexInfo_Scene
|
||||
sprite_path = alt_letter.split("_", 2)[1]
|
||||
pif_sprite.local_path = sprite_path
|
||||
end
|
||||
pif_sprite.dump_info
|
||||
#pif_sprite.dump_info
|
||||
return pif_sprite
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user