DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 13:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed previous commit always causing recompiling if shadow_pokemon.dat doesn't exist, also rubocopping

Browse Source
This commit is contained in:
Maruno17
2023-01-23 22:27:04 +00:00
parent f6213057d8
commit b0b6e675c3
103 changed files with 1099 additions and 1302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Data/Scripts/016_UI/001_Non-interactive UI/001_UI_SplashesAndTitleScreen.rb
View File

@@ -1,3 +1,6 @@
#===============================================================================
#
#===============================================================================
class IntroEventScene < EventScene
# Splash screen images that appear for a few seconds and then disappear.
SPLASH_IMAGES = ["splash1", "splash2"]
@@ -114,8 +117,9 @@ class IntroEventScene < EventScene
end
end
#===============================================================================
#
#===============================================================================
class Scene_Intro
def main
Graphics.transition(0)

5
Data/Scripts/016_UI/001_UI_PauseMenu.rb
View File

@@ -254,8 +254,9 @@ MenuHandlers.add(:pause_menu, :trainer_card, {
MenuHandlers.add(:pause_menu, :save, {
"name" => _INTL("Save"),
"order" => 60,
"condition" => proc { next $game_system && !$game_system.save_disabled &&
!pbInSafari? && !pbInBugContest? },
"condition" => proc {
next $game_system && !$game_system.save_disabled && !pbInSafari? && !pbInBugContest?
},
"effect" => proc { |menu|
menu.pbHideMenu
scene = PokemonSave_Scene.new

2
Data/Scripts/016_UI/010_UI_Phone.rb
View File

@@ -223,7 +223,7 @@ class PokemonPhoneScreen
commands.push(_INTL("Sort Contacts"))
commands.push(_INTL("Cancel"))
cmd = pbShowCommands(nil, commands, -1)
cmd += 1 if cmd >=1 && !contact.can_hide?
cmd += 1 if cmd >= 1 && !contact.can_hide?
case cmd
when 0 # Call
Phone::Call.make_outgoing(contact)

2
Data/Scripts/016_UI/015_UI_Options.rb
View File

@@ -298,7 +298,7 @@ class PokemonOption_Scene
@sprites["option"].viewport = @viewport
@sprites["option"].visible = true
# Get the values of each option
@options.length.times { |i| @sprites["option"].setValueNoRefresh(i, @options[i].get || 0) }
@options.length.times { |i| @sprites["option"].setValueNoRefresh(i, @options[i].get || 0) }
@sprites["option"].refresh
pbChangeSelection
pbDeactivateWindows(@sprites)

2
Data/Scripts/016_UI/021_BattlePointShop.rb → Data/Scripts/016_UI/021_UI_BattlePointShop.rb
View File

@@ -165,7 +165,7 @@ class BattlePointShop_Scene
@sprites["background"] = IconSprite.new(0, 0, @viewport)
@sprites["background"].setBitmap("Graphics/Pictures/martScreen")
@sprites["icon"] = ItemIconSprite.new(36, Graphics.height - 50, nil, @viewport)
winAdapter = BattlePointShopAdapter.new()
winAdapter = BattlePointShopAdapter.new
@sprites["itemwindow"] = Window_BattlePointShop.new(
stock, winAdapter, Graphics.width - 316 - 16, 10, 330 + 16, Graphics.height - 124
)

2
Data/Scripts/016_UI/023_UI_PurifyChamber.rb
View File

@@ -958,7 +958,7 @@ class PurifyChamberSetView < Sprite
type_string += GameData::Type.get(type).name
end
textpos.push([_INTL("{1} Lv.{2} {3}", pkmn.name, pkmn.level, type_string),
2, 6, 0, Color.new(248, 248, 248), Color.new(128, 128, 128)])
2, 6, 0, Color.new(248, 248, 248), Color.new(128, 128, 128)])
textpos.push([_INTL("FLOW"), 2 + (@info.bitmap.width / 2), 30, 0,
Color.new(248, 248, 248), Color.new(128, 128, 128)])
# draw heart gauge

10
Data/Scripts/016_UI/025_UI_TextEntry.rb
View File

@@ -64,8 +64,6 @@ class Window_CharacterEntry < Window_DrawableCommand
end
end
#===============================================================================
# Text entry screen - free typing.
#===============================================================================
@@ -256,8 +254,6 @@ class PokemonEntryScene
end
end
#===============================================================================
# Text entry screen - arrows to select letter.
#===============================================================================
@@ -372,8 +368,6 @@ class PokemonEntryScene2
end
end
def pbStartScene(helptext, minlength, maxlength, initialText, subject = 0, pokemon = nil)
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.z = 99999
@@ -751,8 +745,6 @@ class PokemonEntryScene2
end
end
#===============================================================================
#
#===============================================================================
@@ -769,8 +761,6 @@ class PokemonEntry
end
end
#===============================================================================
#
#===============================================================================