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

Deleted rubyscreen.dll, eradicated semicolons from when... statements, compiling is now before setting up the system, appeased vocal dissenters

Browse Source
This commit is contained in:
Maruno17
2020-11-26 21:10:45 +00:00
parent 017cdb8d0f
commit eb22e49d9b
73 changed files with 905 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -760,12 +760,12 @@ class PokemonPokedex_Scene
# Remove all unseen species from the results
dexlist = dexlist.find_all { |item| next $Trainer.seen[item[0]] }
case $PokemonGlobal.pokedexMode
when MODENUMERICAL; dexlist.sort! { |a,b| a[4]<=>b[4] }
when MODEATOZ; dexlist.sort! { |a,b| a[1]<=>b[1] }
when MODEHEAVIEST; dexlist.sort! { |a,b| b[3]<=>a[3] }
when MODELIGHTEST; dexlist.sort! { |a,b| a[3]<=>b[3] }
when MODETALLEST; dexlist.sort! { |a,b| b[2]<=>a[2] }
when MODESMALLEST; dexlist.sort! { |a,b| a[2]<=>b[2] }
when MODENUMERICAL then dexlist.sort! { |a,b| a[4]<=>b[4] }
when MODEATOZ then dexlist.sort! { |a,b| a[1]<=>b[1] }
when MODEHEAVIEST then dexlist.sort! { |a,b| b[3]<=>a[3] }
when MODELIGHTEST then dexlist.sort! { |a,b| a[3]<=>b[3] }
when MODETALLEST then dexlist.sort! { |a,b| b[2]<=>a[2] }
when MODESMALLEST then dexlist.sort! { |a,b| a[2]<=>b[2] }
end
return dexlist
end
@@ -822,17 +822,17 @@ class PokemonPokedex_Scene
ret = nil
# Set background
case mode
when 0; @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_order")
when 1; @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_name")
when 0 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_order")
when 1 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_name")
when 2
if PBTypes.regularTypesCount==18
@sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_type_18")
else
@sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_type")
end
when 3,4; @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_size")
when 5; @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_color")
when 6; @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_shape")
when 3, 4 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_size")
when 5 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_color")
when 6 then @sprites["searchbg"].setBitmap("Graphics/Pictures/Pokedex/bg_search_shape")
end
selindex = selitems.clone
index = selindex[0]

10
Data/Scripts/017_UI/004_PScreen_PokedexEntry.rb
View File

@@ -186,8 +186,8 @@ class PokemonPokedexInfo_Scene
thisformname = thisform[2]
else # Necessarily applies only to form 0
case thisform[1]
when 0; thisformname = _INTL("Male")
when 1; thisformname = _INTL("Female")
when 0 then thisformname = _INTL("Male")
when 1 then thisformname = _INTL("Female")
else
thisformname = (multiforms) ? _INTL("One Form") : _INTL("Genderless")
end
@@ -212,9 +212,9 @@ class PokemonPokedexInfo_Scene
@sprites["formicon"].visible = (@page==3) if @sprites["formicon"]
# Draw page-specific information
case page
when 1; drawPageInfo
when 2; drawPageArea
when 3; drawPageForms
when 1 then drawPageInfo
when 2 then drawPageArea
when 3 then drawPageForms
end
end

18
Data/Scripts/017_UI/006_PScreen_Summary.rb
View File

@@ -347,11 +347,11 @@ class PokemonSummary_Scene
drawMarkings(overlay,84,292)
# Draw page-specific information
case page
when 1; drawPageOne
when 2; drawPageTwo
when 3; drawPageThree
when 4; drawPageFour
when 5; drawPageFive
when 1 then drawPageOne
when 2 then drawPageTwo
when 3 then drawPageThree
when 4 then drawPageFour
when 5 then drawPageFive
end
end
@@ -409,8 +409,12 @@ class PokemonSummary_Scene
ownerbase = Color.new(64,64,64)
ownershadow = Color.new(176,176,176)
case @pokemon.owner.gender
when 0; ownerbase = Color.new(24,112,216); ownershadow = Color.new(136,168,208)
when 1; ownerbase = Color.new(248,56,32); ownershadow = Color.new(224,152,144)
when 0
ownerbase = Color.new(24, 112, 216)
ownershadow = Color.new(136, 168, 208)
when 1
ownerbase = Color.new(248, 56, 32)
ownershadow = Color.new(224, 152, 144)
end
textpos.push([@pokemon.owner.name,435,176,2,ownerbase,ownershadow])
textpos.push([sprintf("%05d",@pokemon.owner.public_id),435,208,2,Color.new(64,64,64),Color.new(176,176,176)])

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

@@ -106,9 +106,9 @@ $VersionStyles = [
def pbSettingToTextSpeed(speed)
case speed
when 0; return 2
when 1; return 1
when 2; return -2
when 0 then return 2
when 1 then return 1
when 2 then return -2
end
return MessageConfig::TextSpeed || 1
end

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

@@ -1582,10 +1582,10 @@ class PokemonStorageScreen
_INTL("Cancel")
])
case command
when 0; pbWithdraw(selected,nil)
when 1; pbSummary(selected,nil)
when 2; pbMark(selected,nil)
when 3; pbRelease(selected,nil)
when 0 then pbWithdraw(selected, nil)
when 1 then pbSummary(selected, nil)
when 2 then pbMark(selected, nil)
when 3 then pbRelease(selected, nil)
end
end
end
@@ -1615,10 +1615,10 @@ class PokemonStorageScreen
_INTL("Cancel")
])
case command
when 0; pbStore([-1,selected],nil)
when 1; pbSummary([-1,selected],nil)
when 2; pbMark([-1,selected],nil)
when 3; pbRelease([-1,selected],nil)
when 0 then pbStore([-1, selected], nil)
when 1 then pbSummary([-1, selected], nil)
when 2 then pbMark([-1, selected], nil)
when 3 then pbRelease([-1, selected], nil)
end
end
end
@@ -1961,15 +1961,18 @@ class PokemonStorageScreen
retval = selected
break
end
when 1; pbSummary(selected,nil)
when 1
pbSummary(selected,nil)
when 2 # Store/Withdraw
if selected[0]==-1
pbStore(selected,nil)
else
pbWithdraw(selected,nil)
end
when 3; pbItem(selected,nil)
when 4; pbMark(selected,nil)
when 3
pbItem(selected,nil)
when 4
pbMark(selected,nil)
end
end
end

6
Data/Scripts/017_UI/019_PScreen_PC.rb
View File

@@ -111,9 +111,9 @@ def pbTrainerPCMenu
_INTL("Turn Off")
],-1,nil,command)
case command
when 0; pbPCItemStorage
when 1; pbPCMailbox
else; break
when 0 then pbPCItemStorage
when 1 then pbPCMailbox
else break
end
end
end

32
Data/Scripts/017_UI/021_PScreen_Evolution.rb
View File

@@ -259,22 +259,22 @@ class SpriteMetafilePlayer
value=@metafile[j][1]
for sprite in @sprites
case code
when SpriteMetafile::X; sprite.x=value
when SpriteMetafile::Y; sprite.y=value
when SpriteMetafile::OX; sprite.ox=value
when SpriteMetafile::OY; sprite.oy=value
when SpriteMetafile::ZOOM_X; sprite.zoom_x=value
when SpriteMetafile::ZOOM_Y; sprite.zoom_y=value
when SpriteMetafile::SRC_RECT; sprite.src_rect=value
when SpriteMetafile::VISIBLE; sprite.visible=value
when SpriteMetafile::Z; sprite.z=value # prevent crashes
when SpriteMetafile::ANGLE; sprite.angle=(value==180) ? 179.9 : value
when SpriteMetafile::MIRROR; sprite.mirror=value
when SpriteMetafile::BUSH_DEPTH; sprite.bush_depth=value
when SpriteMetafile::OPACITY; sprite.opacity=value
when SpriteMetafile::BLEND_TYPE; sprite.blend_type=value
when SpriteMetafile::COLOR; sprite.color=value
when SpriteMetafile::TONE; sprite.tone=value
when SpriteMetafile::X then sprite.x = value
when SpriteMetafile::Y then sprite.y = value
when SpriteMetafile::OX then sprite.ox = value
when SpriteMetafile::OY then sprite.oy = value
when SpriteMetafile::ZOOM_X then sprite.zoom_x = value
when SpriteMetafile::ZOOM_Y then sprite.zoom_y = value
when SpriteMetafile::SRC_RECT then sprite.src_rect = value
when SpriteMetafile::VISIBLE then sprite.visible = value
when SpriteMetafile::Z then sprite.z = value # prevent crashes
when SpriteMetafile::ANGLE then sprite.angle = (value == 180) ? 179.9 : value
when SpriteMetafile::MIRROR then sprite.mirror = value
when SpriteMetafile::BUSH_DEPTH then sprite.bush_depth = value
when SpriteMetafile::OPACITY then sprite.opacity = value
when SpriteMetafile::BLEND_TYPE then sprite.blend_type = value
when SpriteMetafile::COLOR then sprite.color = value
when SpriteMetafile::TONE then sprite.tone = value
end
end
end