Removed all excess whitespace and standardized line endings.

This commit is contained in:
m3rein
2020-09-05 21:23:16 +02:00
parent caed5bd757
commit 240af4e5e7
219 changed files with 929 additions and 929 deletions

View File

@@ -172,7 +172,7 @@ class PokemonPauseMenu
end
elsif cmdPokemon>=0 && command==cmdPokemon
hiddenmove = nil
pbFadeOutIn {
pbFadeOutIn {
sscene = PokemonParty_Scene.new
sscreen = PokemonPartyScreen.new(sscene,$Trainer.party)
hiddenmove = sscreen.pbPokemonScreen
@@ -185,10 +185,10 @@ class PokemonPauseMenu
end
elsif cmdBag>=0 && command==cmdBag
item = 0
pbFadeOutIn {
pbFadeOutIn {
scene = PokemonBag_Scene.new
screen = PokemonBagScreen.new(scene,$PokemonBag)
item = screen.pbStartScreen
item = screen.pbStartScreen
(item>0) ? @scene.pbEndScene : @scene.pbRefresh
}
if item>0
@@ -204,7 +204,7 @@ class PokemonPauseMenu
@scene.pbRefresh
}
elsif cmdTrainer>=0 && command==cmdTrainer
pbFadeOutIn {
pbFadeOutIn {
scene = PokemonTrainerCard_Scene.new
screen = PokemonTrainerCardScreen.new(scene)
screen.pbStartScreen
@@ -274,4 +274,4 @@ class PokemonPauseMenu
end
@scene.pbEndScene if endscene
end
end
end

View File

@@ -123,4 +123,4 @@ class PokemonPokedexMenuScreen
end
@scene.pbEndScene
end
end
end

View File

@@ -1188,4 +1188,4 @@ class PokemonPokedexScreen
@scene.pbPokedex
@scene.pbEndScene
end
end
end

View File

@@ -583,4 +583,4 @@ class PokemonPokedexInfoScreen
@scene.pbSceneBrief
@scene.pbEndScene
end
end
end

View File

@@ -602,7 +602,7 @@ class PokemonParty_Scene
self.update
end
end
def pbSwitchEnd(oldid,newid)
pbSEPlay("GUI party switch")
oldsprite = @sprites["pokemon#{oldid}"]
@@ -719,7 +719,7 @@ class PokemonParty_Scene
end
def pbChangeSelection(key,currentsel)
numsprites = (@multiselect) ? 8 : 7
numsprites = (@multiselect) ? 8 : 7
case key
when Input::LEFT
begin
@@ -792,7 +792,7 @@ class PokemonParty_Scene
def pbRefresh
for i in 0...6
sprite = @sprites["pokemon#{i}"]
if sprite
if sprite
if sprite.is_a?(PokemonPartyPanel)
sprite.pokemon = sprite.pokemon
else
@@ -804,7 +804,7 @@ class PokemonParty_Scene
def pbRefreshSingle(i)
sprite = @sprites["pokemon#{i}"]
if sprite
if sprite
if sprite.is_a?(PokemonPartyPanel)
sprite.pokemon = sprite.pokemon
else
@@ -1323,7 +1323,7 @@ class PokemonPartyScreen
end
@scene.pbEndScene
return nil
end
end
end
@@ -1334,4 +1334,4 @@ def pbPokemonScreen
sscreen = PokemonPartyScreen.new(sscene,$Trainer.party)
sscreen.pbPokemonScreen
}
end
end

View File

@@ -1352,4 +1352,4 @@ class PokemonSummaryScreen
@scene.pbEndScene
return ret
end
end
end

View File

@@ -317,7 +317,7 @@ class PokemonBag_Scene
# Set the selected item's icon
@sprites["itemicon"].item = itemlist.item
# Set the selected item's description
@sprites["itemtext"].text = (itemlist.item==0) ? _INTL("Close bag.") :
@sprites["itemtext"].text = (itemlist.item==0) ? _INTL("Close bag.") :
pbGetMessage(MessageTypes::ItemDescriptions,itemlist.item)
end
@@ -520,7 +520,7 @@ class PokemonBagScreen
qty.times { @bag.pbDeleteItem(item) }
@scene.pbRefresh
end
end
end
elsif cmdRegister>=0 && command==cmdRegister # Register item
if @bag.pbIsRegistered?(item)
@bag.pbUnregisterItem(item)
@@ -713,4 +713,4 @@ class PokemonBagScreen
end
@scene.pbEndScene
end
end
end

View File

@@ -149,4 +149,4 @@ class PokemonPokegearScreen
end
@scene.pbEndScene
end
end
end

View File

@@ -357,9 +357,9 @@ end
def pbShowMap(region=-1,wallmap=true)
pbFadeOutIn {
pbFadeOutIn {
scene = PokemonRegionMap_Scene.new(region,wallmap)
screen = PokemonRegionMapScreen.new(scene)
screen.pbStartScreen
}
end
end

View File

@@ -145,4 +145,4 @@ class PokemonPhoneScene
pbDisposeSpriteHash(@sprites)
@viewport.dispose
end
end
end

View File

@@ -129,4 +129,4 @@ class PokemonJukeboxScreen
end
@scene.pbEndScene
end
end
end

View File

@@ -85,7 +85,7 @@ class PokemonTrainerCard_Scene
pbPlayCloseMenuSE
break
end
end
end
end
def pbEndScene
@@ -107,4 +107,4 @@ class PokemonTrainerCardScreen
@scene.pbTrainerCard
@scene.pbEndScene
end
end
end

View File

@@ -178,7 +178,7 @@ class EnumOption
attr_reader :values
attr_reader :name
def initialize(name,options,getProc,setProc)
def initialize(name,options,getProc,setProc)
@name = name
@values = options
@getProc = getProc
@@ -205,7 +205,7 @@ class EnumOption2
attr_reader :values
attr_reader :name
def initialize(name,options,getProc,setProc)
def initialize(name,options,getProc,setProc)
@name = name
@values = options
@getProc = getProc
@@ -465,8 +465,8 @@ class PokemonOption_Scene
EnumOption.new(_INTL("Text Speed"),[_INTL("Slow"),_INTL("Normal"),_INTL("Fast")],
proc { $PokemonSystem.textspeed },
proc { |value|
$PokemonSystem.textspeed = value
MessageConfig.pbSetTextSpeed(pbSettingToTextSpeed(value))
$PokemonSystem.textspeed = value
MessageConfig.pbSetTextSpeed(pbSettingToTextSpeed(value))
}
),
EnumOption.new(_INTL("Battle Effects"),[_INTL("On"),_INTL("Off")],
@@ -488,7 +488,7 @@ class PokemonOption_Scene
),
NumberOption.new(_INTL("Speech Frame"),1,$SpeechFrames.length,
proc { $PokemonSystem.textskin },
proc { |value|
proc { |value|
$PokemonSystem.textskin = value
MessageConfig.pbSetSpeechFrame("Graphics/Windowskins/"+$SpeechFrames[value])
}
@@ -497,7 +497,7 @@ class PokemonOption_Scene
proc { $PokemonSystem.frame },
proc { |value|
$PokemonSystem.frame = value
MessageConfig.pbSetSystemFrame($TextFrames[value])
MessageConfig.pbSetSystemFrame($TextFrames[value])
}
),
EnumOption.new(_INTL("Font Style"),[_INTL("Em"),_INTL("R/S"),_INTL("FRLG"),_INTL("DP")],
@@ -621,4 +621,4 @@ class PokemonOptionScreen
@scene.pbOptions
@scene.pbEndScene
end
end
end

View File

@@ -320,8 +320,8 @@ def pbUseKeyItem
$game_temp.in_menu = true
$game_map.update
sscene = PokemonReadyMenu_Scene.new
sscreen = PokemonReadyMenu.new(sscene)
sscreen = PokemonReadyMenu.new(sscene)
sscreen.pbStartReadyMenu(realmoves,realitems)
$game_temp.in_menu = false
end
end
end

View File

@@ -538,7 +538,7 @@ class PokemonBoxPartySprite < SpriteWrapper
pbDrawTextPositions(self.bitmap,[
[_INTL("Back"),86,242,2,Color.new(248,248,248),Color.new(80,80,80),1]
])
xvalues = [18,90,18,90,18,90]
yvalues = [2,18,66,82,130,146]
for j in 0...6
@@ -632,7 +632,7 @@ class PokemonStorageScene
end
def pbCloseBox
pbFadeOutAndHide(@sprites)
pbFadeOutAndHide(@sprites)
pbDisposeSpriteHash(@sprites)
@markingbitmap.dispose if @markingbitmap
@boxviewport.dispose
@@ -868,11 +868,11 @@ class PokemonStorageScene
@selection = selection
if selection>=0
return [@storage.currentBox,selection]
elsif selection==-1 # Box name
elsif selection==-1 # Box name
return [-4,-1]
elsif selection==-2 # Party Pokémon
elsif selection==-2 # Party Pokémon
return [-2,-1]
elsif selection==-3 # Close Box
elsif selection==-3 # Close Box
return [-3,-1]
end
end
@@ -947,7 +947,7 @@ class PokemonStorageScene
if selection>=0 && selection<6
@selection = selection
return selection
elsif selection==6 # Close Box
elsif selection==6 # Close Box
@selection = selection
return (depositing) ? -3 : -1
end
@@ -1365,7 +1365,7 @@ class PokemonStorageScene
@sprites["boxparty"] = PokemonBoxPartySprite.new(@storage.party,@boxsidesviewport)
@sprites["boxparty"].y = oldPartyY
end
def drawMarkings(bitmap,x,y,width,height,markings)
markrect = Rect.new(0,0,16,16)
for i in 0...8
@@ -1692,7 +1692,7 @@ class PokemonStorageScreen
index = selected[1]
if box!=-1
raise _INTL("Can't deposit from box...")
end
end
if pbAbleCount<=1 && pbAble?(@storage[box,index]) && !heldpoke
pbPlayBuzzerSE
pbDisplay(_INTL("That's your last Pokémon!"))
@@ -1740,7 +1740,7 @@ class PokemonStorageScreen
end
@scene.pbHold(selected)
@heldpkmn = @storage[box,index]
@storage.pbDelete(box,index)
@storage.pbDelete(box,index)
@scene.pbRefresh
end
@@ -1974,4 +1974,4 @@ class PokemonStorageScreen
@scene.pbCloseBox
return retval
end
end
end

View File

@@ -86,7 +86,7 @@ class ItemStorage_Scene
@sprites["pocketwindow"].x = 14
@sprites["pocketwindow"].y = 16
pbSetNarrowFont(@sprites["pocketwindow"].bitmap)
# Item description
# Item description
@sprites["itemtextwindow"] = Window_UnformattedTextPokemon.newWithSize("",84,270,Graphics.width-84,128,@viewport)
@sprites["itemtextwindow"].baseColor = ITEMTEXTBASECOLOR
@sprites["itemtextwindow"].shadowColor = ITEMTEXTSHADOWCOLOR
@@ -362,4 +362,4 @@ module UIHelper
helpwindow.visible = oldvisible
return ret
end
end
end

View File

@@ -256,4 +256,4 @@ end
PokemonPCList.registerPC(StorageSystemPC.new)
PokemonPCList.registerPC(TrainerPC.new)
PokemonPCList.registerPC(TrainerPC.new)

View File

@@ -156,7 +156,7 @@ class PokemonEggHatch_Scene
Input.update
self.update
end
end
end
def update
pbUpdateSpriteHash(@sprites)
@@ -231,4 +231,4 @@ Events.onStepTaken += proc { |sender,e|
pbHatch(egg)
end
end
}
}

View File

@@ -365,7 +365,7 @@ class PokemonEvolutionScene
alphaDiff = 10*20/Graphics.frame_rate
loop do
sprite.color.red = 255
sprite.color.green = 255
sprite.color.green = 255
sprite.color.blue = 255
sprite.color.alpha = alpha
sprite.color = sprite.color
@@ -383,7 +383,7 @@ class PokemonEvolutionScene
for j in 0...currenttempo
if alpha<255
sprite.color.red = 255
sprite.color.green = 255
sprite.color.green = 255
sprite.color.blue = 255
sprite.color.alpha = alpha
sprite.color = sprite.color
@@ -485,7 +485,7 @@ class PokemonEvolutionScene
break if tone<=0
end
end
def pbStartScreen(pokemon,newspecies)
@pokemon = pokemon
@newspecies = newspecies
@@ -642,4 +642,4 @@ class PokemonEvolutionScene
$Trainer.owned[createSpecies] = true
pbSeenForm(newpokemon)
end
end
end

View File

@@ -245,4 +245,4 @@ def pbTradeCheckEvolution(pokemon,pokemon2)
next -1
}
return ret
end
end

View File

@@ -222,4 +222,4 @@ def pbRelearnMoveScreen(pokemon)
retval = screen.pbStartScreen(pokemon)
}
return retval
end
end

View File

@@ -11,12 +11,12 @@ class PurifyChamberSet
end
def initialize
@list=[]
@list=[]
@facing=0
end
def facing=(value)
if value>=0 && value<@list.length
if value>=0 && value<@list.length
@facing=value
end
end
@@ -46,7 +46,7 @@ Boosted based on number of best circles
def shadowAffinity
return 0 if @facing<0 || @facing>=@list.length || !@shadow
return (PurifyChamberSet.isSuperEffective(@shadow,@list[@facing])) ? 2 : 1
return (PurifyChamberSet.isSuperEffective(@shadow,@list[@facing])) ? 2 : 1
end
def affinity(i)
@@ -89,7 +89,7 @@ Boosted based on number of best circles
@list[index]=value
@list.compact!
@facing=[[@facing,@list.length-1].min,0].max
end
end
end
# Purify Chamber treats Normal/Normal matchup as super effective
@@ -112,7 +112,7 @@ class PurifyChamber # German: der Kryptorbis
def self.maximumTempo() # Calculates the maximum possible tempo
x=SETSIZE+1
return ((x*x+x)/2)-1
return ((x*x+x)/2)-1
end
def initialize
@@ -352,7 +352,7 @@ module PurifyChamberHelper
chamber.insertAfter(chamber.currentSet,position/2,value)
end
end
end
end
end
@@ -375,7 +375,7 @@ class PurifyChamberScreen
if pkmn.egg?
@scene.pbDisplay(_INTL("Can't place an egg there."))
return false
end
end
if (position==0)
if pkmn.shadowPokemon?
# Remove from storage and place in set
@@ -596,11 +596,11 @@ class PurifyChamberScreen
pbStorePokemon(@chamber[set].shadow)
@chamber.setShadow(set,nil) # Remove shadow Pokemon from set
if (i+1)!=purifiables.length
@scene.pbDisplay(_INTL("There is another Pokémon that is ready to open its heart!"))
@scene.pbDisplay(_INTL("There is another Pokémon that is ready to open its heart!"))
if !@scene.pbConfirm("Would you like to switch sets?")
@scene.pbCloseSet()
break
end
end
end
@scene.pbCloseSet()
end
@@ -725,7 +725,7 @@ class DirectFlowDiagram
@points[j]=BitmapSprite.new(8,8,@viewport)
@points[j].bitmap.fill_rect(0,0,8,8,Color.new(0,0,0))
end
@points[j].tone=(@strength==2) ? Tone.new(232,232,248) :
@points[j].tone=(@strength==2) ? Tone.new(232,232,248) :
Tone.new(16,16,232)
@points[j].visible=(@strength!=0)
end
@@ -798,7 +798,7 @@ class FlowDiagram
@points[j]=BitmapSprite.new(8,8,@viewport)
@points[j].bitmap.fill_rect(0,0,8,8,Color.new(0,0,0))
end
@points[j].tone=(@strength==2) ? Tone.new(232,232,248) :
@points[j].tone=(@strength==2) ? Tone.new(232,232,248) :
Tone.new(16,16,232)
@points[j].visible=(@strength!=0)
end
@@ -909,7 +909,7 @@ class PurifyChamberSetView < SpriteWrapper
if @chamber.setCount(@set)==PurifyChamber::SETSIZE
points=[points/2,1].max
pos/=2
end
end
seg=pos*8/points
if seg==7 || seg==0
pos-=1 if button==Input::LEFT
@@ -1312,4 +1312,4 @@ class PurifyChamberScene
pbFadeInAndShow(@sprites,visible)
return pos
end
end
end

View File

@@ -387,7 +387,7 @@ class PokemonMart_Scene
def pbStartBuyScene(stock,adapter)
pbStartBuyOrSellScene(true,stock,adapter)
end
def pbStartSellScene(bag,adapter)
if $PokemonBag
pbStartSellScene2(bag,adapter)
@@ -622,7 +622,7 @@ class PokemonMart_Scene
pbPlayCancelSE()
ret=0
break
end
end
end
}
}
@@ -740,7 +740,7 @@ class PokemonMartScreen
raise _INTL("Failed to delete stored items")
end
end
pbDisplayPaused(_INTL("You have no more room in the Bag."))
pbDisplayPaused(_INTL("You have no more room in the Bag."))
else
@adapter.setMoney(@adapter.getMoney-price)
for i in 0...@stock.length
@@ -753,7 +753,7 @@ class PokemonMartScreen
if $PokemonBag
if quantity>=10 && pbIsPokeBall?(item) && hasConst?(PBItems,:PREMIERBALL)
if @adapter.addItem(getConst(PBItems,:PREMIERBALL))
pbDisplayPaused(_INTL("I'll throw in a Premier Ball, too."))
pbDisplayPaused(_INTL("I'll throw in a Premier Ball, too."))
end
end
end
@@ -929,4 +929,4 @@ class Game_Interpreter
end
end
end
end
end

View File

@@ -153,7 +153,7 @@ def pbManageMysteryGifts
# Download all gifts from online
msgwindow=pbCreateMessageWindow
pbMessageDisplay(msgwindow,_INTL("Searching for online gifts...\\wtnp[0]"))
online=pbDownloadToString(MYSTERY_GIFT_URL)
online=pbDownloadToString(MYSTERY_GIFT_URL)
pbDisposeMessageWindow(msgwindow)
if online==""
pbMessage(_INTL("No online Mystery Gifts found.\\wtnp[20]"))
@@ -424,4 +424,4 @@ def pbReceiveMysteryGift(id)
end
end
return false
end
end

View File

@@ -7,12 +7,12 @@
#
#===============================================================================
#
# To this scripts works, put it above main, put a 512x384 picture in
# To this scripts works, put it above main, put a 512x384 picture in
# hallfamebars and a 8x24 background picture in hallfamebg. To call this script,
# use 'pbHallOfFameEntry'. After you recorder the first entry, you can access
# the hall teams using a PC. You can also check the player Hall of Fame last
# number using '$PokemonGlobal.hallOfFameLastNumber'.
#
#
#===============================================================================
class HallOfFame_Scene
# When true, all pokémon will be in one line
@@ -24,7 +24,7 @@ class HallOfFame_Scene
ANIMATIONSPEED = 32
# Entry wait time (in 1/20 seconds) between showing each Pokémon (and trainer)
ENTRYWAITTIME = 64
# Maximum number limit of simultaneous hall entries saved.
# Maximum number limit of simultaneous hall entries saved.
# 0 = Doesn't save any hall. -1 = no limit
# Prefer to use larger numbers (like 500 and 1000) than don't put a limit
# If a player exceed this limit, the first one will be removed
@@ -90,7 +90,7 @@ class HallOfFame_Scene
def slowFadeOut(sprites,exponent) # 2 exponent
# To handle values above 8
extraWaitExponent=exponent-9
extraWaitExponent=exponent-9
exponent=8 if 8<exponent
max=2**exponent
speed=(2**8)/max
@@ -110,15 +110,15 @@ class HallOfFame_Scene
# Dispose the sprite if the sprite exists and make it null
def restartSpritePosition(sprites,spritename)
sprites[spritename].dispose if sprites.include?(spritename) && sprites[spritename]
sprites[spritename]=nil
sprites[spritename]=nil
end
# Change the pokémon sprites opacity except the index one
def setPokemonSpritesOpacity(index,opacity=255)
for n in 0...@hallEntry.size
@sprites["pokemon#{n}"].opacity=(n==index) ? 255 : opacity if @sprites["pokemon#{n}"]
end
end
end
end
def saveHallEntry
for i in 0...$Trainer.party.length
@@ -128,7 +128,7 @@ class HallOfFame_Scene
# Update the global variables
$PokemonGlobal.hallOfFame.push(@hallEntry)
$PokemonGlobal.hallOfFameLastNumber+=1
$PokemonGlobal.hallOfFame.delete_at(0) if HALLLIMIT>-1 &&
$PokemonGlobal.hallOfFame.delete_at(0) if HALLLIMIT>-1 &&
$PokemonGlobal.hallOfFame.size>HALLLIMIT
end
@@ -141,7 +141,7 @@ class HallOfFame_Scene
else
ret=(60*(battlernumber/2)+48)*(xpositionformula(battlernumber)-1)
ret+=Graphics.width/2-56
end
end
return ret
end
@@ -151,7 +151,7 @@ class HallOfFame_Scene
ret=32+128*ypositionformula(battlernumber)/2
else
ret=96-8*(battlernumber/2)
end
end
return ret
end
@@ -162,7 +162,7 @@ class HallOfFame_Scene
ret=(battlernumber/3%2==0) ? (19-battlernumber)%3 : (19+battlernumber)%3
else
ret=battlernumber%2*2
end
end
return ret
end
@@ -172,9 +172,9 @@ class HallOfFame_Scene
ret=(battlernumber/3)%2*2
else
ret=1
end
end
return ret
end
end
def moveSprite(i)
spritename=(i>-1) ? "pokemon#{i}" : "trainer"
@@ -202,7 +202,7 @@ class HallOfFame_Scene
for i in 0...6
# Clear all 6 pokémon sprites and dispose the ones that exists every time
# that this method is call
restartSpritePosition(@sprites,"pokemon#{i}")
restartSpritePosition(@sprites,"pokemon#{i}")
next if i>=@hallEntry.size
xpoint=xpointformula(i)
ypoint=ypointformula(i)
@@ -288,11 +288,11 @@ class HallOfFame_Scene
@sprites["msgwindow"]=pbCreateMessageWindow(@viewport)
pbMessageDisplay(@sprites["msgwindow"],
_INTL("League champion!\nCongratulations!\\^"))
end
end
def writePokemonData(pokemon,hallNumber=-1)
overlay=@sprites["overlay"].bitmap
overlay.clear
overlay.clear
pokename=pokemon.name
speciesname=PBSpecies.getName(pokemon.species)
if pokemon.male?
@@ -315,7 +315,7 @@ class HallOfFame_Scene
if (hallNumber>-1)
textPositions.push([_INTL("Hall of Fame No."),Graphics.width/2-104,0,0,BASECOLOR,SHADOWCOLOR])
textPositions.push([hallNumber.to_s,Graphics.width/2+104,0,1,BASECOLOR,SHADOWCOLOR])
end
end
pbDrawTextPositions(overlay,textPositions)
end
@@ -371,7 +371,7 @@ class HallOfFame_Scene
else
@battlerIndex+=1
if @battlerIndex<=@hallEntry.size
# If it is a pokémon, write the pokémon text, wait the
# If it is a pokémon, write the pokémon text, wait the
# ENTRYWAITTIME and goes to the next battler
pbPlayCry(@hallEntry[@battlerIndex-1])
writePokemonData(@hallEntry[@battlerIndex-1])
@@ -395,7 +395,7 @@ class HallOfFame_Scene
createTrainerBattler
end
end
end
end
elsif @battlerIndex>@hallEntry.size
# Write the trainer data and fade
writeTrainerData
@@ -406,7 +406,7 @@ class HallOfFame_Scene
end
fadeSpeed=((Math.log(2**12)-Math.log(FINALFADESPEED))/Math.log(2)).floor
pbBGMFade((2**fadeSpeed).to_f/20) if @useMusic
slowFadeOut(@sprites,fadeSpeed) { pbUpdate }
slowFadeOut(@sprites,fadeSpeed) { pbUpdate }
@alreadyFadedInEnd=true
@battlerIndex+=1
end
@@ -508,4 +508,4 @@ def pbHallOfFamePC
scene=HallOfFame_Scene.new
screen=HallOfFameScreen.new(scene)
screen.pbStartScreenPC
end
end