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

More fixes to text positions

Browse Source
This commit is contained in:
Maruno17
2020-10-20 21:44:09 +01:00
parent 9fd8e5fab3
commit 103d397938
8 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/009_Objects and windows/004_SpriteWindow_text.rb
View File

@@ -1066,7 +1066,7 @@ class Window_UnformattedTextPokemon < SpriteWindow_Base
def resizeHeightToFit(text,width=-1) # width is current window width def resizeHeightToFit(text,width=-1) # width is current window width
dims=resizeToFitInternal(text,width) dims=resizeToFitInternal(text,width)
self.width=width<0 ? Graphics.width : width self.width=width<0 ? Graphics.width : width
self.height=dims[1]+self.borderY self.height = dims[1] + self.borderY - (mkxp? ? 4 : 0)
refresh refresh
end end
@@ -2326,7 +2326,7 @@ class Window_AdvancedCommandPokemon < Window_DrawableCommand
dims=[] dims=[]
getAutoDims(commands,dims,width) getAutoDims(commands,dims,width)
self.width=dims[0] self.width=dims[0]
self.height=dims[1] self.height=dims[1] - (mkxp? ? 6 : 0)
end end
def itemCount def itemCount
@@ -2338,7 +2338,7 @@ class Window_AdvancedCommandPokemon < Window_DrawableCommand
rect=drawCursor(index,rect) rect=drawCursor(index,rect)
if toUnformattedText(@commands[index]).gsub(/\n/,"")==@commands[index] if toUnformattedText(@commands[index]).gsub(/\n/,"")==@commands[index]
# Use faster alternative for unformatted text without line breaks # Use faster alternative for unformatted text without line breaks
pbDrawShadowText(self.contents,rect.x,rect.y,rect.width,rect.height, pbDrawShadowText(self.contents,rect.x,rect.y + (mkxp? ? 6 : 0),rect.width,rect.height,
@commands[index],self.baseColor,self.shadowColor) @commands[index],self.baseColor,self.shadowColor)
else else
chars=getFormattedText( chars=getFormattedText(

8
Data/Scripts/009_Objects and windows/008_TextEntry.rb
View File

@@ -49,16 +49,16 @@ class Window_CharacterEntry < Window_DrawableCommand
def drawItem(index,_count,rect) def drawItem(index,_count,rect)
rect=drawCursor(index,rect) rect=drawCursor(index,rect)
if index==@charset.length # -1 if index==@charset.length # -1
pbDrawShadowText(self.contents,rect.x,rect.y,rect.width,rect.height,"[ ]", pbDrawShadowText(self.contents,rect.x,rect.y + (mkxp? ? 6 : 0),rect.width,rect.height,"[ ]",
self.baseColor,self.shadowColor) self.baseColor,self.shadowColor)
elsif index==@charset.length+1 # -2 elsif index==@charset.length+1 # -2
pbDrawShadowText(self.contents,rect.x,rect.y,rect.width,rect.height,@othercharset, pbDrawShadowText(self.contents,rect.x,rect.y + (mkxp? ? 6 : 0),rect.width,rect.height,@othercharset,
self.baseColor,self.shadowColor) self.baseColor,self.shadowColor)
elsif index==@charset.length+2 # -3 elsif index==@charset.length+2 # -3
pbDrawShadowText(self.contents,rect.x,rect.y,rect.width,rect.height,_INTL("OK"), pbDrawShadowText(self.contents,rect.x,rect.y + (mkxp? ? 6 : 0),rect.width,rect.height,_INTL("OK"),
self.baseColor,self.shadowColor) self.baseColor,self.shadowColor)
else else
pbDrawShadowText(self.contents,rect.x,rect.y,rect.width,rect.height,@charset[index], pbDrawShadowText(self.contents,rect.x,rect.y + (mkxp? ? 6 : 0),rect.width,rect.height,@charset[index],
self.baseColor,self.shadowColor) self.baseColor,self.shadowColor)
end end
end end

4
Data/Scripts/017_UI/002_PScreen_PokedexMenu.rb
View File

@@ -17,9 +17,9 @@ class Window_DexesList < Window_CommandPokemon
def drawItem(index,count,rect) def drawItem(index,count,rect)
super(index,count,rect) super(index,count,rect)
if index>=0 && index<@commands2.length if index>=0 && index<@commands2.length
pbDrawShadowText(self.contents,rect.x+254,rect.y,64,rect.height, pbDrawShadowText(self.contents,rect.x+254,rect.y + (mkxp? ? 6 : 0),64,rect.height,
sprintf("%d",@commands2[index][0]),self.baseColor,self.shadowColor,1) sprintf("%d",@commands2[index][0]),self.baseColor,self.shadowColor,1)
pbDrawShadowText(self.contents,rect.x+350,rect.y,64,rect.height, pbDrawShadowText(self.contents,rect.x+350,rect.y + (mkxp? ? 6 : 0),64,rect.height,
sprintf("%d",@commands2[index][1]),self.baseColor,self.shadowColor,1) sprintf("%d",@commands2[index][1]),self.baseColor,self.shadowColor,1)
allseen = (@commands2[index][0]>=@commands2[index][2]) allseen = (@commands2[index][0]>=@commands2[index][2])
allown = (@commands2[index][1]>=@commands2[index][2]) allown = (@commands2[index][1]>=@commands2[index][2])

2
Data/Scripts/017_UI/003_PScreen_PokedexMain.rb
View File

@@ -45,7 +45,7 @@ class Window_Pokedex < Window_DrawableCommand
else else
text = sprintf("%03d ----------",indexNumber) text = sprintf("%03d ----------",indexNumber)
end end
pbDrawShadowText(self.contents,rect.x+36,rect.y+6,rect.width,rect.height, pbDrawShadowText(self.contents,rect.x+36,rect.y+6 + (mkxp? ? 6 : 0),rect.width,rect.height,
text,self.baseColor,self.shadowColor) text,self.baseColor,self.shadowColor)
end end

3
Data/Scripts/017_UI/005_PScreen_Party.rb
View File

@@ -122,7 +122,8 @@ class Window_CommandPokemonColor < Window_CommandPokemon
base = Color.new(0,80,160) base = Color.new(0,80,160)
shadow = Color.new(128,192,240) shadow = Color.new(128,192,240)
end end
pbDrawShadowText(self.contents,rect.x,rect.y,rect.width,rect.height,@commands[index],base,shadow) pbDrawShadowText(self.contents,rect.x,rect.y + (mkxp? ? 6 : 0),rect.width,rect.height,
@commands[index],base,shadow)
end end
end end

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

@@ -331,7 +331,8 @@ class Window_PokemonOption < Window_DrawableCommand
rect = drawCursor(index,rect) rect = drawCursor(index,rect)
optionname = (index==@options.length) ? _INTL("Cancel") : @options[index].name optionname = (index==@options.length) ? _INTL("Cancel") : @options[index].name
optionwidth = rect.width*9/20 optionwidth = rect.width*9/20
pbDrawShadowText(self.contents,rect.x,rect.y,optionwidth,rect.height,optionname, text_y = rect.y + (mkxp? ? 6 : 0)
pbDrawShadowText(self.contents,rect.x,text_y,optionwidth,rect.height,optionname,
@nameBaseColor,@nameShadowColor) @nameBaseColor,@nameShadowColor)
return if index==@options.length return if index==@options.length
if @options[index].is_a?(EnumOption) if @options[index].is_a?(EnumOption)
@@ -345,7 +346,7 @@ class Window_PokemonOption < Window_DrawableCommand
xpos = optionwidth+rect.x xpos = optionwidth+rect.x
ivalue = 0 ivalue = 0
for value in @options[index].values for value in @options[index].values
pbDrawShadowText(self.contents,xpos,rect.y,optionwidth,rect.height,value, pbDrawShadowText(self.contents,xpos,text_y,optionwidth,rect.height,value,
(ivalue==self[index]) ? @selBaseColor : self.baseColor, (ivalue==self[index]) ? @selBaseColor : self.baseColor,
(ivalue==self[index]) ? @selShadowColor : self.shadowColor (ivalue==self[index]) ? @selShadowColor : self.shadowColor
) )
@@ -354,14 +355,14 @@ class Window_PokemonOption < Window_DrawableCommand
ivalue += 1 ivalue += 1
end end
else else
pbDrawShadowText(self.contents,rect.x+optionwidth,rect.y,optionwidth,rect.height, pbDrawShadowText(self.contents,rect.x+optionwidth,text_y,optionwidth,rect.height,
optionname,self.baseColor,self.shadowColor) optionname,self.baseColor,self.shadowColor)
end end
elsif @options[index].is_a?(NumberOption) elsif @options[index].is_a?(NumberOption)
value = _INTL("Type {1}/{2}",@options[index].optstart+self[index], value = _INTL("Type {1}/{2}",@options[index].optstart+self[index],
@options[index].optend-@options[index].optstart+1) @options[index].optend-@options[index].optstart+1)
xpos = optionwidth+rect.x xpos = optionwidth+rect.x
pbDrawShadowText(self.contents,xpos,rect.y,optionwidth,rect.height,value, pbDrawShadowText(self.contents,xpos,text_y,optionwidth,rect.height,value,
@selBaseColor,@selShadowColor) @selBaseColor,@selShadowColor)
elsif @options[index].is_a?(SliderOption) elsif @options[index].is_a?(SliderOption)
value = sprintf(" %d",@options[index].optend) value = sprintf(" %d",@options[index].optend)
@@ -375,12 +376,12 @@ class Window_PokemonOption < Window_DrawableCommand
8,16,@selBaseColor) 8,16,@selBaseColor)
value = sprintf("%d",@options[index].optstart+self[index]) value = sprintf("%d",@options[index].optstart+self[index])
xpos += optionwidth-self.contents.text_size(value).width xpos += optionwidth-self.contents.text_size(value).width
pbDrawShadowText(self.contents,xpos,rect.y,optionwidth,rect.height,value, pbDrawShadowText(self.contents,xpos,text_y,optionwidth,rect.height,value,
@selBaseColor,@selShadowColor) @selBaseColor,@selShadowColor)
else else
value = @options[index].values[self[index]] value = @options[index].values[self[index]]
xpos = optionwidth+rect.x xpos = optionwidth+rect.x
pbDrawShadowText(self.contents,xpos,rect.y,optionwidth,rect.height,value, pbDrawShadowText(self.contents,xpos,text_y,optionwidth,rect.height,value,
@selBaseColor,@selShadowColor) @selBaseColor,@selShadowColor)
end end
end end

9
Data/Scripts/017_UI/017_PScreen_PokemonStorage.rb
View File

@@ -413,7 +413,8 @@ class PokemonBoxSprite < SpriteWrapper
pbSetSystemFont(@contents) pbSetSystemFont(@contents)
widthval = @contents.text_size(boxname).width widthval = @contents.text_size(boxname).width
xval = 162-(widthval/2) xval = 162-(widthval/2)
pbDrawShadowText(@contents,xval,8,widthval,32,boxname,Color.new(248,248,248),Color.new(40,48,48)) pbDrawShadowText(@contents,xval,8 + (mkxp? ? 6 : 0),widthval,32,
boxname,Color.new(248,248,248),Color.new(40,48,48))
@refreshBox = false @refreshBox = false
end end
yval = self.y+30 yval = self.y+30
@@ -536,7 +537,7 @@ class PokemonBoxPartySprite < SpriteWrapper
def refresh def refresh
@contents.blt(0,0,@boxbitmap.bitmap,Rect.new(0,0,172,352)) @contents.blt(0,0,@boxbitmap.bitmap,Rect.new(0,0,172,352))
pbDrawTextPositions(self.bitmap,[ pbDrawTextPositions(self.bitmap,[
[_INTL("Back"),86,242,2,Color.new(248,248,248),Color.new(80,80,80),1] [_INTL("Back"),86,242 - (mkxp? ? 2 : 0),2,Color.new(248,248,248),Color.new(80,80,80),1]
]) ])
xvalues = [18,90,18,90,18,90] xvalues = [18,90,18,90,18,90]
@@ -1384,8 +1385,8 @@ class PokemonStorageScene
buttonbase = Color.new(248,248,248) buttonbase = Color.new(248,248,248)
buttonshadow = Color.new(80,80,80) buttonshadow = Color.new(80,80,80)
pbDrawTextPositions(overlay,[ pbDrawTextPositions(overlay,[
[_INTL("Party: {1}",(@storage.party.length rescue 0)),270,328,2,buttonbase,buttonshadow,1], [_INTL("Party: {1}",(@storage.party.length rescue 0)),270,328 - (mkxp? ? 2 : 0),2,buttonbase,buttonshadow,1],
[_INTL("Exit"),446,328,2,buttonbase,buttonshadow,1], [_INTL("Exit"),446,328 - (mkxp? ? 2 : 0),2,buttonbase,buttonshadow,1],
]) ])
pokemon = nil pokemon = nil
if @screen.pbHeldPokemon if @screen.pbHeldPokemon

12
Data/Scripts/021_Debug/002_Debug_Actions.rb
View File

@@ -98,9 +98,10 @@ class SpriteWindow_DebugVariables < Window_DrawableCommand
idWidth = totalWidth*15/100 idWidth = totalWidth*15/100
nameWidth = totalWidth*65/100 nameWidth = totalWidth*65/100
statusWidth = totalWidth*20/100 statusWidth = totalWidth*20/100
self.shadowtext(rect.x,rect.y,idWidth,rect.height,id_text) text_y = rect.y + (mkxp? ? 6 : 0)
self.shadowtext(rect.x+idWidth,rect.y,nameWidth,rect.height,name,0,(codeswitch) ? 1 : 0) self.shadowtext(rect.x,text_y,idWidth,rect.height,id_text)
self.shadowtext(rect.x+idWidth+nameWidth,rect.y,statusWidth,rect.height,status,1,colors) self.shadowtext(rect.x+idWidth,text_y,nameWidth,rect.height,name,0,(codeswitch) ? 1 : 0)
self.shadowtext(rect.x+idWidth+nameWidth,text_y,statusWidth,rect.height,status,1,colors)
end end
end end
@@ -419,8 +420,9 @@ class SpriteWindow_DebugRoamers < Window_DrawableCommand
else else
status = "[NOT ROAMING][Switch #{pkmn[2]} is off]" status = "[NOT ROAMING][Switch #{pkmn[2]} is off]"
end end
self.shadowtext(name,rect.x,rect.y,nameWidth,rect.height) text_y = rect.y + (mkxp? ? 6 : 0)
self.shadowtext(status,rect.x+nameWidth,rect.y,statusWidth,rect.height,1,statuscolor) self.shadowtext(name,rect.x,text_y,nameWidth,rect.height)
self.shadowtext(status,rect.x+nameWidth,text_y,statusWidth,rect.height,1,statuscolor)
end end
end end
end end