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

Removed unnecessary text drawing in Options screen, misc tweaks

Browse Source
This commit is contained in:
Maruno17
2020-09-09 23:03:27 +01:00
parent ebbc4a0ad8
commit aaf5949c13
5 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Data/Scripts/009_Objects and windows/003_SpriteWindow.rb
View File

@@ -384,27 +384,27 @@ end
# Sets a bitmap's font to the system font. # Sets a bitmap's font to the system font.
def pbSetSystemFont(bitmap) def pbSetSystemFont(bitmap)
fontname=MessageConfig.pbGetSystemFontName fontname = MessageConfig.pbGetSystemFontName
bitmap.font.name=fontname bitmap.font.name = fontname
if fontname=="Pokemon FireLeaf" || fontname=="Power Red and Green" if fontname == "Pokemon FireLeaf" || fontname == "Power Red and Green"
bitmap.font.size=29 bitmap.font.size = 29
elsif fontname=="Pokemon Emerald Small" || fontname=="Power Green Small" elsif fontname == "Pokemon Emerald Small" || fontname == "Power Green Small"
bitmap.font.size=25 bitmap.font.size = 25
else else
bitmap.font.size=31 bitmap.font.size = 31
end end
end end
# Sets a bitmap's font to the system small font. # Sets a bitmap's font to the system small font.
def pbSetSmallFont(bitmap) def pbSetSmallFont(bitmap)
bitmap.font.name=pbSmallFontName bitmap.font.name = pbSmallFontName
bitmap.font.size=25 bitmap.font.size = 25
end end
# Sets a bitmap's font to the system narrow font. # Sets a bitmap's font to the system narrow font.
def pbSetNarrowFont(bitmap) def pbSetNarrowFont(bitmap)
bitmap.font.name=pbNarrowFontName bitmap.font.name = pbNarrowFontName
bitmap.font.size=31 bitmap.font.size = 31
end end
#=============================================================================== #===============================================================================

2
Data/Scripts/010_Scenes/005_Scene_Credits.rb
View File

@@ -127,7 +127,7 @@ _END_
end end
plugin_credits << "\n" plugin_credits << "\n"
end end
CREDIT.gsub!(/{INSERTS_PLUGIN_CREDITS_DO_NOT_REMOVE}/, plugin_credits) CREDIT.gsub!(/\{INSERTS_PLUGIN_CREDITS_DO_NOT_REMOVE\}/, plugin_credits)
credit_lines = CREDIT.split(/\n/) credit_lines = CREDIT.split(/\n/)
credit_bitmap = Bitmap.new(Graphics.width,32 * credit_lines.size) credit_bitmap = Bitmap.new(Graphics.width,32 * credit_lines.size)
credit_lines.each_index do |i| credit_lines.each_index do |i|

10
Data/Scripts/012_Battle/005_Battle scene/005_PokeBattle_SceneMenus.rb
View File

@@ -413,14 +413,16 @@ class FightMenuDisplay < BattleMenuBase
def refreshMegaEvolutionButton def refreshMegaEvolutionButton
return if !USE_GRAPHICS return if !USE_GRAPHICS
@megaButton.src_rect.y = (@mode-1)*@megaEvoBitmap.height/2 @megaButton.src_rect.y = (@mode - 1) * @megaEvoBitmap.height / 2
@megaButton.z = self.z - 1 @megaButton.z = self.z - 1
@visibility["megaButton"] = (@mode > 0)
end end
def refreshShiftButton def refreshShiftButton
return if !USE_GRAPHICS return if !USE_GRAPHICS
@shiftButton.src_rect.y = (@shiftMode-1)*@shiftBitmap.height @shiftButton.src_rect.y = (@shiftMode - 1) * @shiftBitmap.height
@shiftButton.z = self.z - 1 @shiftButton.z = self.z - 1
@visibility["shiftButton"] = (@shiftMode > 0)
end end
def refresh def refresh

3
Data/Scripts/017_UI/015_PScreen_Options.rb
View File

@@ -333,7 +333,6 @@ class Window_PokemonOption < Window_DrawableCommand
optionwidth = rect.width*9/20 optionwidth = rect.width*9/20
pbDrawShadowText(self.contents,rect.x,rect.y,optionwidth,rect.height,optionname, pbDrawShadowText(self.contents,rect.x,rect.y,optionwidth,rect.height,optionname,
@nameBaseColor,@nameShadowColor) @nameBaseColor,@nameShadowColor)
self.contents.draw_text(rect.x,rect.y,optionwidth,rect.height,optionname)
return if index==@options.length return if index==@options.length
if @options[index].is_a?(EnumOption) if @options[index].is_a?(EnumOption)
if @options[index].values.length>1 if @options[index].values.length>1
@@ -350,7 +349,6 @@ class Window_PokemonOption < Window_DrawableCommand
(ivalue==self[index]) ? @selBaseColor : self.baseColor, (ivalue==self[index]) ? @selBaseColor : self.baseColor,
(ivalue==self[index]) ? @selShadowColor : self.shadowColor (ivalue==self[index]) ? @selShadowColor : self.shadowColor
) )
self.contents.draw_text(xpos,rect.y,optionwidth,rect.height,value)
xpos += self.contents.text_size(value).width xpos += self.contents.text_size(value).width
xpos += spacing xpos += spacing
ivalue += 1 ivalue += 1
@@ -384,7 +382,6 @@ class Window_PokemonOption < Window_DrawableCommand
xpos = optionwidth+rect.x xpos = optionwidth+rect.x
pbDrawShadowText(self.contents,xpos,rect.y,optionwidth,rect.height,value, pbDrawShadowText(self.contents,xpos,rect.y,optionwidth,rect.height,value,
@selBaseColor,@selShadowColor) @selBaseColor,@selShadowColor)
self.contents.draw_text(xpos,rect.y,optionwidth,rect.height,value)
end end
end end

8
Data/Scripts/022_Compiler/001_Compiler.rb
View File

@@ -1167,15 +1167,15 @@ def pbCompileAllData(mustCompile)
yield(_INTL("Compiling shadow move data")) yield(_INTL("Compiling shadow move data"))
pbCompileShadowMoves pbCompileShadowMoves
yield(_INTL("Compiling messages")) yield(_INTL("Compiling messages"))
pbCompileAnimations
pbCompileTrainerEvents(mustCompile)
pbSetTextMessages
MessageTypes.saveMessages
else else
if (!$INEDITOR || LANGUAGES.length<2) && safeExists?("Data/messages.dat") if (!$INEDITOR || LANGUAGES.length<2) && safeExists?("Data/messages.dat")
MessageTypes.loadMessageFile("Data/messages.dat") MessageTypes.loadMessageFile("Data/messages.dat")
end end
end end
pbCompileAnimations
pbCompileTrainerEvents(mustCompile)
pbSetTextMessages
MessageTypes.saveMessages
if !$INEDITOR && LANGUAGES.length>=2 if !$INEDITOR && LANGUAGES.length>=2
pbLoadMessages("Data/"+LANGUAGES[$PokemonSystem.language][1]) pbLoadMessages("Data/"+LANGUAGES[$PokemonSystem.language][1])
end end