DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-05-09 01:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidied up semicolon use, refactored random dungeon generation code, fixed visual bug in Day Care debug screen

Browse Source
This commit is contained in:
Maruno17
2021-08-22 23:18:34 +01:00
parent ecc5a040cd
commit 8bb70a226e
64 changed files with 1286 additions and 926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

262
Data/Scripts/016_UI/003_UI_Pokedex_Main.rb
View File

@@ -103,27 +103,39 @@ class PokedexSearchSelectionSprite < SpriteWrapper
@mode = value
case @mode
when 0 # Order
@xstart = 46; @ystart = 128
@xgap = 236; @ygap = 64
@xstart = 46
@ystart = 128
@xgap = 236
@ygap = 64
@cols = 2
when 1 # Name
@xstart = 78; @ystart = 114
@xgap = 52; @ygap = 52
@xstart = 78
@ystart = 114
@xgap = 52
@ygap = 52
@cols = 7
when 2 # Type
@xstart = 8; @ystart = 104
@xgap = 124; @ygap = 44
@xstart = 8
@ystart = 104
@xgap = 124
@ygap = 44
@cols = 4
when 3,4 # Height, weight
@xstart = 44; @ystart = 110
@xgap = 8; @ygap = 112
@xstart = 44
@ystart = 110
@xgap = 8
@ygap = 112
when 5 # Color
@xstart = 62; @ystart = 114
@xgap = 132; @ygap = 52
@xstart = 62
@ystart = 114
@xgap = 132
@ygap = 52
@cols = 3
when 6 # Shape
@xstart = 82; @ystart = 116
@xgap = 70; @ygap = 70
@xstart = 82
@ystart = 116
@xgap = 70
@ygap = 70
@cols = 5
end
end
@@ -133,46 +145,63 @@ class PokedexSearchSelectionSprite < SpriteWrapper
if @mode==-1 # Main search screen
case @index
when 0 # Order
self.src_rect.y = 0; self.src_rect.height = 44
self.src_rect.y = 0
self.src_rect.height = 44
when 1,5 # Name, color
self.src_rect.y = 44; self.src_rect.height = 44
self.src_rect.y = 44
self.src_rect.height = 44
when 2 # Type
self.src_rect.y = 88; self.src_rect.height = 44
self.src_rect.y = 88
self.src_rect.height = 44
when 3,4 # Height, weight
self.src_rect.y = 132; self.src_rect.height = 44
self.src_rect.y = 132
self.src_rect.height = 44
when 6 # Shape
self.src_rect.y = 176; self.src_rect.height = 68
self.src_rect.y = 176
self.src_rect.height = 68
else # Reset/start/cancel
self.src_rect.y = 244; self.src_rect.height = 40
self.src_rect.y = 244
self.src_rect.height = 40
end
case @index
when 0 # Order
self.x = 252; self.y = 52
self.x = 252
self.y = 52
when 1,2,3,4 # Name, type, height, weight
self.x = 114; self.y = 110+(@index-1)*52
self.x = 114
self.y = 110 + (@index - 1) * 52
when 5 # Color
self.x = 382; self.y = 110
self.x = 382
self.y = 110
when 6 # Shape
self.x = 420; self.y = 214
self.x = 420
self.y = 214
when 7,8,9 # Reset, start, cancel
self.x = 4+(@index-7)*176; self.y = 334
self.x = 4 + (@index - 7) * 176
self.y = 334
end
else # Parameter screen
case @index
when -2,-3 # OK, Cancel
self.src_rect.y = 244; self.src_rect.height = 40
self.src_rect.y = 244
self.src_rect.height = 40
else
case @mode
when 0 # Order
self.src_rect.y = 0; self.src_rect.height = 44
self.src_rect.y = 0
self.src_rect.height = 44
when 1 # Name
self.src_rect.y = 284; self.src_rect.height = 44
self.src_rect.y = 284
self.src_rect.height = 44
when 2,5 # Type, color
self.src_rect.y = 44; self.src_rect.height = 44
self.src_rect.y = 44
self.src_rect.height = 44
when 3,4 # Height, weight
self.src_rect.y = (@minmax==1) ? 328 : 424; self.src_rect.height = 96
self.src_rect.y = (@minmax == 1) ? 328 : 424
self.src_rect.height = 96
when 6 # Shape
self.src_rect.y = 176; self.src_rect.height = 68
self.src_rect.y = 176
self.src_rect.height = 68
end
end
case @index
@@ -185,9 +214,11 @@ class PokedexSearchSelectionSprite < SpriteWrapper
self.y = @ystart+(@cmds/@cols).floor*@ygap
end
when -2 # OK
self.x = 4; self.y = 334
self.x = 4
self.y = 334
when -3 # Cancel
self.x = 356; self.y = 334
self.x = 356
self.y = 334
else
case @mode
when 0,1,2,5,6 # Order, name, type, color, shape
@@ -527,34 +558,57 @@ class PokemonPokedex_Scene
textpos.push([title,102,(mode==6) ? 58 : 52,0,base,shadow])
case mode
when 0 # Order
xstart = 46; ystart = 128
xgap = 236; ygap = 64
halfwidth = 92; cols = 2
selbuttony = 0; selbuttonheight = 44
xstart = 46
ystart = 128
xgap = 236
ygap = 64
halfwidth = 92
cols = 2
selbuttony = 0
selbuttonheight = 44
when 1 # Name
xstart = 78; ystart = 114
xgap = 52; ygap = 52
halfwidth = 22; cols = 7
selbuttony = 156; selbuttonheight = 44
xstart = 78
ystart = 114
xgap = 52
ygap = 52
halfwidth = 22
cols = 7
selbuttony = 156
selbuttonheight = 44
when 2 # Type
xstart = 8; ystart = 104
xgap = 124; ygap = 44
halfwidth = 62; cols = 4
selbuttony = 44; selbuttonheight = 44
xstart = 8
ystart = 104
xgap = 124
ygap = 44
halfwidth = 62
cols = 4
selbuttony = 44
selbuttonheight = 44
when 3,4 # Height, weight
xstart = 44; ystart = 110
xgap = 304/(cmds.length+1); ygap = 112
halfwidth = 60; cols = cmds.length+1
xstart = 44
ystart = 110
xgap = 304 / (cmds.length + 1)
ygap = 112
halfwidth = 60
cols = cmds.length + 1
when 5 # Color
xstart = 62; ystart = 114
xgap = 132; ygap = 52
halfwidth = 62; cols = 3
selbuttony = 44; selbuttonheight = 44
xstart = 62
ystart = 114
xgap = 132
ygap = 52
halfwidth = 62
cols = 3
selbuttony = 44
selbuttonheight = 44
when 6 # Shape
xstart = 82; ystart = 116
xgap = 70; ygap = 70
halfwidth = 0; cols = 5
selbuttony = 88; selbuttonheight = 68
xstart = 82
ystart = 116
xgap = 70
ygap = 70
halfwidth = 0
cols = 5
selbuttony = 88
selbuttonheight = 68
end
# Draw selected option(s) text in top bar
case mode
@@ -870,23 +924,32 @@ class PokemonPokedex_Scene
Input.update
if mode==3 || mode==4
if Input.trigger?(Input::UP)
if index<-1; minmax = 0; index = selindex[minmax] # From OK/Cancel
elsif minmax==0; minmax = 1; index = selindex[minmax]
if index<-1 # From OK/Cancel
minmax = 0
index = selindex[minmax]
elsif minmax==0
minmax = 1
index = selindex[minmax]
end
if index!=oldindex || minmax!=oldminmax
pbPlayCursorSE
pbRefreshDexSearchParam(mode,cmds,selindex,index)
end
elsif Input.trigger?(Input::DOWN)
if minmax==1; minmax = 0; index = selindex[minmax]
elsif minmax==0; minmax = -1; index = -2
if minmax==1
minmax = 0
index = selindex[minmax]
elsif minmax==0
minmax = -1
index = -2
end
if index!=oldindex || minmax!=oldminmax
pbPlayCursorSE
pbRefreshDexSearchParam(mode,cmds,selindex,index)
end
elsif Input.repeat?(Input::LEFT)
if index==-3; index = -2
if index==-3
index = -2
elsif index>=-1
if minmax==1 && index==-1
index = cmds.length-1 if selindex[0]<cmds.length-1
@@ -902,10 +965,13 @@ class PokemonPokedex_Scene
pbRefreshDexSearchParam(mode,cmds,selindex,index)
end
elsif Input.repeat?(Input::RIGHT)
if index==-2; index = -3
if index==-2
index = -3
elsif index>=-1
if minmax==1 && index>=cmds.length; index = 0
elsif minmax==1 && index==cmds.length-1; index = -1
if minmax==1 && index>=cmds.length
index = 0
elsif minmax==1 && index==cmds.length-1
index = -1
elsif index<cmds.length && !(minmax==1 && index<0)
index += 1 if minmax==1 || selindex[1]==-1 ||
(selindex[1]<cmds.length && selindex[1]>=index+1)
@@ -919,17 +985,24 @@ class PokemonPokedex_Scene
end
else
if Input.trigger?(Input::UP)
if index==-1; index = cmds.length-1-(cmds.length-1)%cols-1 # From blank
elsif index==-2; index = ((cmds.length-1)/cols).floor*cols # From OK
elsif index==-3 && mode==0; index = cmds.length-1 # From Cancel
elsif index==-3; index = -1 # From Cancel
elsif index>=cols; index -= cols
if index==-1 # From blank
index = cmds.length-1-(cmds.length-1)%cols-1
elsif index==-2 # From OK
index = ((cmds.length-1)/cols).floor*cols
elsif index==-3 && mode==0 # From Cancel
index = cmds.length-1
elsif index==-3 # From Cancel
index = -1
elsif index>=cols
index -= cols
end
pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::DOWN)
if index==-1; index = -3 # From blank
if index==-1 # From blank
index = -3
elsif index>=0
if index+cols<cmds.length; index += cols
if index+cols<cmds.length
index += cols
elsif (index/cols).floor<((cmds.length-1)/cols).floor
index = (index%cols<cols/2.0) ? cmds.length-1 : -1
else
@@ -938,15 +1011,21 @@ class PokemonPokedex_Scene
end
pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::LEFT)
if index==-3; index = -2
elsif index==-1; index = cmds.length-1
elsif index>0 && index%cols!=0; index -= 1
if index==-3
index = -2
elsif index==-1
index = cmds.length-1
elsif index>0 && index%cols!=0
index -= 1
end
pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::RIGHT)
if index==-2; index = -3
elsif index==cmds.length-1 && mode!=0; index = -1
elsif index>=0 && index%cols!=cols-1; index += 1
if index==-2
index = -3
elsif index==cmds.length-1 && mode!=0
index = -1
elsif index>=0 && index%cols!=cols-1
index += 1
end
pbPlayCursorSE if index!=oldindex
end
@@ -1043,26 +1122,37 @@ class PokemonPokedex_Scene
oldindex = index
end
if Input.trigger?(Input::UP)
if index>=7; index = 4
elsif index==5; index = 0
elsif index>0; index -= 1
if index>=7
index = 4
elsif index==5
index = 0
elsif index>0
index -= 1
end
pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::DOWN)
if index==4 || index==6; index = 8
elsif index<7; index += 1
if index==4 || index==6
index = 8
elsif index<7
index += 1
end
pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::LEFT)
if index==5; index = 1
elsif index==6; index = 3
elsif index>7; index -= 1
if index==5
index = 1
elsif index==6
index = 3
elsif index>7
index -= 1
end
pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::RIGHT)
if index==1; index = 5
elsif index>=2 && index<=4; index = 6
elsif index==7 || index==8; index += 1
if index==1
index = 5
elsif index>=2 && index<=4
index = 6
elsif index==7 || index==8
index += 1
end
pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::ACTION)

3
Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
View File

@@ -372,7 +372,8 @@ class PokemonPokedexInfo_Scene
formname = ""
for i in @available
if i[1]==@gender && i[2]==@form
formname = i[0]; break
formname = i[0]
break
end
end
textpos = [

34
Data/Scripts/016_UI/005_UI_Party.rb
View File

@@ -298,15 +298,22 @@ class PokemonPartyPanel < SpriteWrapper
@refreshing = true
if @panelbgsprite && !@panelbgsprite.disposed?
if self.selected
if self.preselected; @panelbgsprite.changeBitmap("swapsel2")
elsif @switching; @panelbgsprite.changeBitmap("swapsel")
elsif @pokemon.fainted?; @panelbgsprite.changeBitmap("faintedsel")
else; @panelbgsprite.changeBitmap("ablesel")
if self.preselected
@panelbgsprite.changeBitmap("swapsel2")
elsif @switching
@panelbgsprite.changeBitmap("swapsel")
elsif @pokemon.fainted?
@panelbgsprite.changeBitmap("faintedsel")
else
@panelbgsprite.changeBitmap("ablesel")
end
else
if self.preselected; @panelbgsprite.changeBitmap("swap")
elsif @pokemon.fainted?; @panelbgsprite.changeBitmap("fainted")
else; @panelbgsprite.changeBitmap("able")
if self.preselected
@panelbgsprite.changeBitmap("swap")
elsif @pokemon.fainted?
@panelbgsprite.changeBitmap("fainted")
else
@panelbgsprite.changeBitmap("able")
end
end
@panelbgsprite.x = self.x
@@ -316,9 +323,12 @@ class PokemonPartyPanel < SpriteWrapper
if @hpbgsprite && !@hpbgsprite.disposed?
@hpbgsprite.visible = (!@pokemon.egg? && !(@text && @text.length>0))
if @hpbgsprite.visible
if self.preselected || (self.selected && @switching); @hpbgsprite.changeBitmap("swap")
elsif @pokemon.fainted?; @hpbgsprite.changeBitmap("fainted")
else; @hpbgsprite.changeBitmap("able")
if self.preselected || (self.selected && @switching)
@hpbgsprite.changeBitmap("swap")
elsif @pokemon.fainted?
@hpbgsprite.changeBitmap("fainted")
else
@hpbgsprite.changeBitmap("able")
end
@hpbgsprite.x = self.x+96
@hpbgsprite.y = self.y+50
@@ -1022,7 +1032,9 @@ class PokemonPartyScreen
addedEntry = false
if pkmnid == Settings::MAX_PARTY_SIZE # Confirm was chosen
ret = []
for i in realorder; ret.push(@party[i]); end
for i in realorder
ret.push(@party[i])
end
error = []
break if ruleset.isValid?(ret,error)
pbDisplay(error[0])

42
Data/Scripts/016_UI/006_UI_Summary.rb
View File

@@ -705,9 +705,12 @@ class PokemonSummary_Scene
if move.total_pp>0
textpos.push([_INTL("PP"),342,yPos+32,0,moveBase,moveShadow])
ppfraction = 0
if move.pp==0; ppfraction = 3
elsif move.pp*4<=move.total_pp; ppfraction = 2
elsif move.pp*2<=move.total_pp; ppfraction = 1
if move.pp==0
ppfraction = 3
elsif move.pp*4<=move.total_pp
ppfraction = 2
elsif move.pp*2<=move.total_pp
ppfraction = 1
end
textpos.push([sprintf("%d/%d",move.pp,move.total_pp),460,yPos+32,1,ppBase[ppfraction],ppShadow[ppfraction]])
end
@@ -768,9 +771,12 @@ class PokemonSummary_Scene
if move.total_pp>0
textpos.push([_INTL("PP"),342,yPos+32,0,moveBase,moveShadow])
ppfraction = 0
if move.pp==0; ppfraction = 3
elsif move.pp*4<=move.total_pp; ppfraction = 2
elsif move.pp*2<=move.total_pp; ppfraction = 1
if move.pp==0
ppfraction = 3
elsif move.pp*4<=move.total_pp
ppfraction = 2
elsif move.pp*2<=move.total_pp
ppfraction = 1
end
textpos.push([sprintf("%d/%d",move.pp,move.total_pp),460,yPos+32,1,ppBase[ppfraction],ppShadow[ppfraction]])
end
@@ -1128,17 +1134,25 @@ class PokemonSummary_Scene
redraw = true
end
elsif Input.trigger?(Input::UP)
if index==7; index = 6
elsif index==6; index = 4
elsif index<3; index = 7
else; index -= 3
if index==7
index = 6
elsif index==6
index = 4
elsif index<3
index = 7
else
index -= 3
end
pbPlayCursorSE
elsif Input.trigger?(Input::DOWN)
if index==7; index = 1
elsif index==6; index = 7
elsif index>=3; index = 6
else; index += 3
if index==7
index = 1
elsif index==6
index = 7
elsif index>=3
index = 6
else
index += 3
end
pbPlayCursorSE
elsif Input.trigger?(Input::LEFT)

6
Data/Scripts/016_UI/007_UI_Bag.rb
View File

@@ -160,9 +160,11 @@ class PokemonBag_Scene
(!@filterlist && @bag.pockets[lastpocket].length==0)
for i in 1...@bag.pockets.length
if @filterlist && @filterlist[i].length>0
lastpocket = i; break
lastpocket = i
break
elsif !@filterlist && @bag.pockets[i].length>0
lastpocket = i; break
lastpocket = i
break
end
end
end

6
Data/Scripts/016_UI/016_UI_ReadyMenu.rb
View File

@@ -117,8 +117,10 @@ class PokemonReadyMenu_Scene
if @index[1]>=@itemcommands.length && @itemcommands.length>0
@index[1] = @itemcommands.length-1
end
if @index[2]==0 && @movecommands.length==0; @index[2] = 1
elsif @index[2]==1 && @itemcommands.length==0; @index[2] = 0
if @index[2]==0 && @movecommands.length==0
@index[2] = 1
elsif @index[2]==1 && @itemcommands.length==0
@index[2] = 0
end
@viewport = Viewport.new(0,0,Graphics.width,Graphics.height)
@viewport.z = 99999

29
Data/Scripts/016_UI/017_UI_PokemonStorage.rb
View File

@@ -1262,16 +1262,24 @@ class PokemonStorageScene
selection -= 3 if selection%3==0
end
when Input::UP
if selection==7; selection = 6
elsif selection==6; selection = 4
elsif selection<3; selection = 7
else; selection -= 3
if selection==7
selection = 6
elsif selection==6
selection = 4
elsif selection<3
selection = 7
else
selection -= 3
end
when Input::DOWN
if selection==7; selection = 1
elsif selection==6; selection = 7
elsif selection>=3; selection = 6
else; selection += 3
if selection==7
selection = 1
elsif selection==6
selection = 7
elsif selection>=3
selection = 6
else
selection += 3
end
end
return selection
@@ -1675,7 +1683,7 @@ class PokemonStorageScreen
box = selected[0]
index = selected[1]
if box==-1
raise _INTL("Can't withdraw from party...");
raise _INTL("Can't withdraw from party...")
end
if @storage.party_full?
pbDisplay(_INTL("Your party's full!"))
@@ -1912,7 +1920,8 @@ class PokemonStorageScreen
index = 0
for i in 0...papers[1].length
if papers[1][i]==@storage[@storage.currentBox].background
index = i; break
index = i
break
end
end
wpaper = pbShowCommands(_INTL("Pick the wallpaper."),papers[0],index)

8
Data/Scripts/016_UI/022_UI_PurifyChamber.rb
View File

@@ -1181,7 +1181,9 @@ class PurifyChamberScene
def pbSetScreen
pbDeactivateWindows(@sprites) {
loop do
Graphics.update; Input.update; pbUpdate
Graphics.update
Input.update
pbUpdate
btn=0
btn=Input::DOWN if Input.repeat?(Input::DOWN)
btn=Input::UP if Input.repeat?(Input::UP)
@@ -1218,7 +1220,9 @@ class PurifyChamberScene
oldindex=@sprites["setwindow"].index
@sprites["setview"].set=oldindex
end
Graphics.update; Input.update; pbUpdate
Graphics.update
Input.update
pbUpdate
if Input.trigger?(Input::USE)
pbPlayDecisionSE()
return @sprites["setwindow"].index

11
Data/Scripts/016_UI/023_UI_MysteryGift.rb
View File

@@ -61,7 +61,9 @@ def pbEditMysteryGift(type,item,id=0,giftname="")
master=IO.read("MysteryGiftMaster.txt")
master=pbMysteryGiftDecrypt(master)
end
for i in master; idlist.push(i[0]); end
for i in master
idlist.push(i[0])
end
params=ChooseNumberParams.new
params.setRange(0,99999)
params.setDefaultValue(id)
@@ -199,7 +201,8 @@ def pbManageMysteryGifts
replaced=false
for i in 0...$Trainer.mystery_gifts.length
if $Trainer.mystery_gifts[i][0]==gift[0]
$Trainer.mystery_gifts[i]=gift; replaced=true
$Trainer.mystery_gifts[i]=gift
replaced=true
end
end
$Trainer.mystery_gifts.push(gift) if !replaced
@@ -260,7 +263,9 @@ def pbDownloadMysteryGift(trainer)
else
loop do
commands=[]
for gift in pending; commands.push(gift[3]); end
for gift in pending
commands.push(gift[3])
end
commands.push(_INTL("Cancel"))
pbMessageDisplay(sprites["msgwindow"],_INTL("Choose the gift you want to receive.\\wtnp[0]"))
command=pbShowCommands(sprites["msgwindow"],commands,-1)