fixed battles lag

This commit is contained in:
infinitefusion
2021-06-26 16:09:31 -04:00
parent 84d885d4b0
commit 605f387c65
4 changed files with 1579 additions and 1573 deletions

View File

@@ -80,15 +80,16 @@ class PokeBattle_Battle
end end
def pbCanMegaEvolve?(idxBattler) def pbCanMegaEvolve?(idxBattler)
return false if $game_switches[Settings::NO_MEGA_EVOLUTION] return false
return false if !@battlers[idxBattler].hasMega? # return false if $game_switches[Settings::NO_MEGA_EVOLUTION]
return false if wildBattle? && opposes?(idxBattler) # return false if !@battlers[idxBattler].hasMega?
return true if $DEBUG && Input.press?(Input::CTRL) # return false if wildBattle? && opposes?(idxBattler)
return false if @battlers[idxBattler].effects[PBEffects::SkyDrop]>=0 # return true if $DEBUG && Input.press?(Input::CTRL)
return false if !pbHasMegaRing?(idxBattler) # return false if @battlers[idxBattler].effects[PBEffects::SkyDrop]>=0
side = @battlers[idxBattler].idxOwnSide # return false if !pbHasMegaRing?(idxBattler)
owner = pbGetOwnerIndexFromBattlerIndex(idxBattler) # side = @battlers[idxBattler].idxOwnSide
return @megaEvolution[side][owner]==-1 # owner = pbGetOwnerIndexFromBattlerIndex(idxBattler)
# return @megaEvolution[side][owner]==-1
end end
def pbRegisterMegaEvolution(idxBattler) def pbRegisterMegaEvolution(idxBattler)

View File

@@ -10,7 +10,7 @@ class PokeBattle_Scene
FIGHT_BOX = 3 FIGHT_BOX = 3
TARGET_BOX = 4 TARGET_BOX = 4
MESSAGE_PAUSE_TIME = (Graphics.frame_rate*1.0).floor # 1 second MESSAGE_PAUSE_TIME = (Graphics.frame_rate*0.25).floor # 1 second
#============================================================================= #=============================================================================
# Updating and refreshing # Updating and refreshing

File diff suppressed because it is too large Load Diff

View File

@@ -18,14 +18,14 @@
// If this fails, the version defaults to 1. // If this fails, the version defaults to 1.
// (default: 0) // (default: 0)
// //
// "rgssVersion": 1, "rgssVersion": 1,
// Create a debug context and log // Create a debug context and log
// OpenGL debug information to the console // OpenGL debug information to the console
// (default: disabled) // (default: disabled)
// //
// "debugMode": false, "debugMode": false,
// Continuously print average FPS to console. // Continuously print average FPS to console.
@@ -33,40 +33,40 @@
// FPS display toggled via F2 // FPS display toggled via F2
// (default: disabled) // (default: disabled)
// //
// "printFPS": false, "printFPS": false,
// Game window is resizable // Game window is resizable
// (default: enabled) // (default: enabled)
// //
// "winResizable": true, "winResizable": true,
// Start game in fullscreen (this can // Start game in fullscreen (this can
// always be toggled with Alt-Enter at runtime) // always be toggled with Alt-Enter at runtime)
// (default: disabled) // (default: disabled)
// //
// "fullscreen": false, "fullscreen": false,
// Preserve game screen aspect ratio, // Preserve game screen aspect ratio,
// as opposed to stretch-to-fill // as opposed to stretch-to-fill
// (default: enabled) // (default: enabled)
// //
// "fixedAspectRatio": true, "fixedAspectRatio": true,
// Apply linear interpolation when game screen // Apply linear interpolation when game screen
// is upscaled // is upscaled
// (default: disabled) // (default: disabled)
// //
// "smoothScaling": false, "smoothScaling": false,
// Sync screen redraws to the monitor refresh rate // Sync screen redraws to the monitor refresh rate
// (default: disabled) // (default: disabled)
// //
// "vsync": false, "vsync": false,
// Specify the window width on startup. If set to 0, // Specify the window width on startup. If set to 0,
@@ -90,14 +90,14 @@
// Override the game window title // Override the game window title
// (default: none) // (default: none)
// //
// "windowTitle": "Custom Title", "windowTitle": "Pokémon Infinite Fusion",
// Enforce a static frame rate // Enforce a static frame rate
// This option may be force-disabled at build time. // This option may be force-disabled at build time.
// (0 = disabled) // (0 = disabled)
// //
// "fixedFramerate": 0, "fixedFramerate": 0,
// Skip (don't draw) frames when behind. // Skip (don't draw) frames when behind.
@@ -105,7 +105,7 @@
// default value when the game starts. // default value when the game starts.
// (default: disabled) // (default: disabled)
// //
// "frameSkip": false, "frameSkip": false,
// Use a fixed framerate that is approx. equal to the // Use a fixed framerate that is approx. equal to the
@@ -117,13 +117,13 @@
// This option may be force-disabled at build time. // This option may be force-disabled at build time.
// (default: disabled) // (default: disabled)
// //
// "syncToRefreshrate": false, "syncToRefreshrate": false,
// Don't use alpha blending when rendering text // Don't use alpha blending when rendering text
// (default: disabled) // (default: disabled)
// //
// "solidFonts": false, "solidFonts": false,
// Work around buggy graphics drivers which don't // Work around buggy graphics drivers which don't
@@ -132,7 +132,7 @@
// tileset doesn't render at all // tileset doesn't render at all
// (default: disabled) // (default: disabled)
// //
// "subImageFix": false, "subImageFix": false,
// Enable framebuffer blitting if the driver is // Enable framebuffer blitting if the driver is
@@ -141,7 +141,7 @@
// disabling it can be used as a workaround // disabling it can be used as a workaround
// (default: enabled) // (default: enabled)
// //
// "enableBlitting": true, "enableBlitting": true,
// Limit the maximum size (width, height) of // Limit the maximum size (width, height) of
@@ -152,26 +152,26 @@
// be played back on machines with lower specs. // be played back on machines with lower specs.
// (default: 0) // (default: 0)
// //
// "maxTextureSize": 0, "maxTextureSize": 0,
// Set the base path of the game to '/path/to/game' // Set the base path of the game to '/path/to/game'
// (default: executable directory) // (default: executable directory)
// //
// "gameFolder": ".", "gameFolder": ".",
// Use either right or left Alt + Enter to toggle // Use either right or left Alt + Enter to toggle
// fullscreen // fullscreen
// (default: disabled) // (default: disabled)
// //
// "anyAltToggleFS": false, "anyAltToggleFS": false,
// Enable F12 game reset // Enable F12 game reset
// (default: enabled) // (default: enabled)
// //
// "enableReset": true, "enableReset": true,
// Names of the input buttons in the F1 key bindings // Names of the input buttons in the F1 key bindings
@@ -191,7 +191,7 @@
// Allow symlinks for game assets to be followed // Allow symlinks for game assets to be followed
// (default: disabled) // (default: disabled)
// //
// "allowSymlinks": false, "allowSymlinks": false,
// Organisation / company and application / game // Organisation / company and application / game
@@ -233,7 +233,7 @@
// (emulates windows case insensitivity) // (emulates windows case insensitivity)
// (default: enabled) // (default: enabled)
// //
// "pathCache": true, "pathCache": true,
// In some versions of Essentials, overworld code // In some versions of Essentials, overworld code
// requests the player's sprite texture from disk // requests the player's sprite texture from disk
@@ -255,7 +255,7 @@
// loose and disable this option. // loose and disable this option.
// (default: false) // (default: false)
// //
// "compressedGraphics": false, "compressedGraphics": false,
// Add 'rtp1', 'rtp2.zip' and 'game.rgssad' to the // Add 'rtp1', 'rtp2.zip' and 'game.rgssad' to the
@@ -270,7 +270,7 @@
// Use the script's name as filename in warnings and error messages // Use the script's name as filename in warnings and error messages
// (default: enabled) // (default: enabled)
// //
// "useScriptNames": true, "useScriptNames": true,
// Font substitutions allow drop-in replacements of fonts // Font substitutions allow drop-in replacements of fonts
@@ -304,26 +304,26 @@
// that it needs. Only works with Ruby 2.6 or higher. // that it needs. Only works with Ruby 2.6 or higher.
// (default: false) // (default: false)
// //
// "JITEnable": false, "JITEnable": false,
// Determines what level of verbosity to use when // Determines what level of verbosity to use when
// logging JIT events. Starts at 0, which is next // logging JIT events. Starts at 0, which is next
// to nothing. Set it higher to see more. // to nothing. Set it higher to see more.
// (default: 0) // (default: 0)
// //
// "JITVerboseLevel": 0, "JITVerboseLevel": 0,
// Determines how many compiled methods that Ruby // Determines how many compiled methods that Ruby
// will keep in its cache. // will keep in its cache.
// (default: 100) // (default: 100)
// //
// "JITMaxCache": 100, "JITMaxCache": 100,
// Determines how many times a function has to be // Determines how many times a function has to be
// called before it is compiled. // called before it is compiled.
// (default: 10000) // (default: 10000)
// //
// "JITMinCalls": 10000, "JITMinCalls": 10000,
// SoundFont to use for midi playback (via fluidsynth) // SoundFont to use for midi playback (via fluidsynth)
@@ -334,12 +334,12 @@
// Activate "chorus" effect for midi playback // Activate "chorus" effect for midi playback
// //
// "midiChorus": false, "midiChorus": false,
// Activate "reverb" effect for midi playback // Activate "reverb" effect for midi playback
// //
// "midiReverb": false, "midiReverb": false,
// Number of OpenAL sources to allocate for SE playback. // Number of OpenAL sources to allocate for SE playback.
@@ -347,7 +347,7 @@
// and audibly cutting each other off, try increasing // and audibly cutting each other off, try increasing
// this number. Maximum: 64. // this number. Maximum: 64.
// //
// "SESourceCount": 6 "SESourceCount": 6
// The Windows game executable name minus ".exe". By default // The Windows game executable name minus ".exe". By default
@@ -360,6 +360,6 @@
// "Game.rgssad", but specifying the executable name here // "Game.rgssad", but specifying the executable name here
// is a tiny bit less intrusive. // is a tiny bit less intrusive.
// //
// "execName": "Game" "execName": "Game"
} }