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 up text positioning and window sizes, fixed crash when choosing how many items to toss from the Bag

Browse Source
This commit is contained in:
Maruno17
2021-03-07 23:08:05 +00:00
parent 3ca08f27b8
commit 4c35a7ecfe
31 changed files with 342 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,7 @@ class Window_Pokedex < Window_DrawableCommand
else
text = sprintf("%03d ----------",indexNumber)
end
pbDrawShadowText(self.contents,rect.x+36,rect.y+6 + 6,rect.width,rect.height,
pbDrawShadowText(self.contents,rect.x+36,rect.y+6,rect.width,rect.height,
text,self.baseColor,self.shadowColor)
end
@@ -392,17 +392,17 @@ class PokemonPokedex_Scene
end
end
textpos = [
[dexname,Graphics.width/2,2,2,Color.new(248,248,248),Color.new(0,0,0)]
[dexname,Graphics.width/2,-2,2,Color.new(248,248,248),Color.new(0,0,0)]
]
textpos.push([GameData::Species.get(iconspecies).name,112,52,2,base,shadow]) if iconspecies
textpos.push([GameData::Species.get(iconspecies).name,112,46,2,base,shadow]) if iconspecies
if @searchResults
textpos.push([_INTL("Search results"),112,308,2,base,shadow])
textpos.push([@dexlist.length.to_s,112,340,2,base,shadow])
textpos.push([_INTL("Search results"),112,302,2,base,shadow])
textpos.push([@dexlist.length.to_s,112,334,2,base,shadow])
else
textpos.push([_INTL("Seen:"),42,308,0,base,shadow])
textpos.push([$Trainer.seen_count(pbGetPokedexRegion).to_s,182,308,1,base,shadow])
textpos.push([_INTL("Owned:"),42,340,0,base,shadow])
textpos.push([$Trainer.owned_count(pbGetPokedexRegion).to_s,182,340,1,base,shadow])
textpos.push([_INTL("Seen:"),42,302,0,base,shadow])
textpos.push([$Trainer.seen_count(pbGetPokedexRegion).to_s,182,302,1,base,shadow])
textpos.push([_INTL("Owned:"),42,334,0,base,shadow])
textpos.push([$Trainer.owned_count(pbGetPokedexRegion).to_s,182,334,1,base,shadow])
end
# Draw all text
pbDrawTextPositions(overlay,textpos)
@@ -445,36 +445,36 @@ class PokemonPokedex_Scene
shadow = Color.new(72,72,72)
# Write various bits of text
textpos = [
[_INTL("Search Mode"),Graphics.width/2,2,2,base,shadow],
[_INTL("Order"),136,58,2,base,shadow],
[_INTL("Name"),58,116,2,base,shadow],
[_INTL("Type"),58,168,2,base,shadow],
[_INTL("Height"),58,220,2,base,shadow],
[_INTL("Weight"),58,272,2,base,shadow],
[_INTL("Color"),326,116,2,base,shadow],
[_INTL("Shape"),454,168,2,base,shadow],
[_INTL("Search Mode"),Graphics.width/2,-2,2,base,shadow],
[_INTL("Order"),136,52,2,base,shadow],
[_INTL("Name"),58,110,2,base,shadow],
[_INTL("Type"),58,162,2,base,shadow],
[_INTL("Height"),58,214,2,base,shadow],
[_INTL("Weight"),58,266,2,base,shadow],
[_INTL("Color"),326,110,2,base,shadow],
[_INTL("Shape"),454,162,2,base,shadow],
[_INTL("Reset"),80,338,2,base,shadow,1],
[_INTL("Start"),Graphics.width/2,338,2,base,shadow,1],
[_INTL("Cancel"),Graphics.width-80,338,2,base,shadow,1]
]
# Write order, name and color parameters
textpos.push([@orderCommands[params[0]],344,60,2,base,shadow,1])
textpos.push([(params[1]<0) ? "----" : @nameCommands[params[1]],176,118,2,base,shadow,1])
textpos.push([(params[8]<0) ? "----" : @colorCommands[params[8]].name,444,118,2,base,shadow,1])
textpos.push([@orderCommands[params[0]],344,58,2,base,shadow,1])
textpos.push([(params[1]<0) ? "----" : @nameCommands[params[1]],176,116,2,base,shadow,1])
textpos.push([(params[8]<0) ? "----" : @colorCommands[params[8]].name,444,116,2,base,shadow,1])
# Draw type icons
if params[2]>=0
type_number = @typeCommands[params[2]].id_number
typerect = Rect.new(0,type_number*32,96,32)
overlay.blt(128,168,@typebitmap.bitmap,typerect)
else
textpos.push(["----",176,170,2,base,shadow,1])
textpos.push(["----",176,168,2,base,shadow,1])
end
if params[3]>=0
type_number = @typeCommands[params[3]].id_number
typerect = Rect.new(0,type_number*32,96,32)
overlay.blt(256,168,@typebitmap.bitmap,typerect)
else
textpos.push(["----",304,170,2,base,shadow,1])
textpos.push(["----",304,168,2,base,shadow,1])
end
# Write height and weight limits
ht1 = (params[4]<0) ? 0 : (params[4]>=@heightCommands.length) ? 999 : @heightCommands[params[4]]
@@ -487,16 +487,16 @@ class PokemonPokedex_Scene
ht2 = (params[5]<0) ? 99*12 : (ht2/0.254).round
wt1 = (params[6]>=@weightCommands.length) ? 99990 : (wt1/0.254).round
wt2 = (params[7]<0) ? 99990 : (wt2/0.254).round
textpos.push([sprintf("%d'%02d''",ht1/12,ht1%12),166,222,2,base,shadow,1])
textpos.push([sprintf("%d'%02d''",ht2/12,ht2%12),294,222,2,base,shadow,1])
textpos.push([sprintf("%.1f",wt1/10.0),166,274,2,base,shadow,1])
textpos.push([sprintf("%.1f",wt2/10.0),294,274,2,base,shadow,1])
textpos.push([sprintf("%d'%02d''",ht1/12,ht1%12),166,220,2,base,shadow,1])
textpos.push([sprintf("%d'%02d''",ht2/12,ht2%12),294,220,2,base,shadow,1])
textpos.push([sprintf("%.1f",wt1/10.0),166,272,2,base,shadow,1])
textpos.push([sprintf("%.1f",wt2/10.0),294,272,2,base,shadow,1])
hwoffset = true
else
textpos.push([sprintf("%.1f",ht1/10.0),166,222,2,base,shadow,1])
textpos.push([sprintf("%.1f",ht2/10.0),294,222,2,base,shadow,1])
textpos.push([sprintf("%.1f",wt1/10.0),166,274,2,base,shadow,1])
textpos.push([sprintf("%.1f",wt2/10.0),294,274,2,base,shadow,1])
textpos.push([sprintf("%.1f",ht1/10.0),166,220,2,base,shadow,1])
textpos.push([sprintf("%.1f",ht2/10.0),294,220,2,base,shadow,1])
textpos.push([sprintf("%.1f",wt1/10.0),166,272,2,base,shadow,1])
textpos.push([sprintf("%.1f",wt2/10.0),294,272,2,base,shadow,1])
end
overlay.blt(344,214,@hwbitmap.bitmap,Rect.new(0,(hwoffset) ? 44 : 0,32,44))
overlay.blt(344,266,@hwbitmap.bitmap,Rect.new(32,(hwoffset) ? 44 : 0,32,44))
@@ -517,13 +517,13 @@ class PokemonPokedex_Scene
shadow = Color.new(72,72,72)
# Write various bits of text
textpos = [
[_INTL("Search Mode"),Graphics.width/2,2,2,base,shadow],
[_INTL("Search Mode"),Graphics.width/2,-2,2,base,shadow],
[_INTL("OK"),80,338,2,base,shadow,1],
[_INTL("Cancel"),Graphics.width-80,338,2,base,shadow,1]
]
title = [_INTL("Order"),_INTL("Name"),_INTL("Type"),_INTL("Height"),
_INTL("Weight"),_INTL("Color"),_INTL("Shape")][mode]
textpos.push([title,102,(mode==6) ? 64 : 58,0,base,shadow])
textpos.push([title,102,(mode==6) ? 58 : 52,0,base,shadow])
case mode
when 0 # Order
xstart = 46; ystart = 128
@@ -627,8 +627,8 @@ class PokemonPokedex_Scene
xpos2 = xstart+(sel[1]+1)*xgap
xpos2 = xstart+cols*xgap if sel[1]<0
xpos2 = xstart if sel[1]>=cols-1
ypos1 = ystart+64-4+112
ypos2 = ystart+32-4
ypos1 = ystart+172
ypos2 = ystart+28
overlay.blt(16,120,@searchsliderbitmap.bitmap,Rect.new(0,192,32,44)) if sel[1]<cols-1
overlay.blt(464,120,@searchsliderbitmap.bitmap,Rect.new(32,192,32,44)) if sel[1]>=0
overlay.blt(16,264,@searchsliderbitmap.bitmap,Rect.new(0,192,32,44)) if sel[0]>=0