mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 21:54:58 +00:00
Removed all excess whitespace and standardized line endings.
This commit is contained in:
@@ -289,4 +289,4 @@ module Mouse
|
||||
@SetClassLong.call(Win32API.pbFindRgssWindow,-12,@oldcursor)
|
||||
@oldcursor = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -12,7 +12,7 @@ def pbLoadRxData(file) # :nodoc:
|
||||
if $RPGVX
|
||||
return load_data(file+".rvdata")
|
||||
else
|
||||
return load_data(file+".rxdata")
|
||||
return load_data(file+".rxdata")
|
||||
end
|
||||
end
|
||||
|
||||
@@ -134,4 +134,4 @@ end
|
||||
|
||||
|
||||
|
||||
pbSetUpSystem
|
||||
pbSetUpSystem
|
||||
|
||||
@@ -164,11 +164,11 @@ def pbCheckPokemonIconFiles(params,egg=false)
|
||||
if egg
|
||||
bitmapFileName = sprintf("Graphics/Icons/icon%segg_%d",getConstantName(PBSpecies,species),params[3]) rescue nil
|
||||
if !pbResolveBitmap(bitmapFileName)
|
||||
bitmapFileName = sprintf("Graphics/Icons/icon%03degg_%d",species,params[3])
|
||||
bitmapFileName = sprintf("Graphics/Icons/icon%03degg_%d",species,params[3])
|
||||
if !pbResolveBitmap(bitmapFileName)
|
||||
bitmapFileName = sprintf("Graphics/Icons/icon%segg",getConstantName(PBSpecies,species)) rescue nil
|
||||
if !pbResolveBitmap(bitmapFileName)
|
||||
bitmapFileName = sprintf("Graphics/Icons/icon%03degg",species)
|
||||
bitmapFileName = sprintf("Graphics/Icons/icon%03degg",species)
|
||||
if !pbResolveBitmap(bitmapFileName)
|
||||
bitmapFileName = sprintf("Graphics/Icons/iconEgg")
|
||||
end
|
||||
@@ -443,7 +443,7 @@ def pbCryFrameLength(pokemon,form=0,pitch=nil)
|
||||
else
|
||||
pkmnwav = pbResolveAudioSE(pbCryFile(pokemon))
|
||||
playtime = getPlayTime(pkmnwav) if pkmnwav
|
||||
end
|
||||
end
|
||||
end
|
||||
playtime /= pitch # sound is lengthened the lower the pitch
|
||||
# 4 is added to provide a buffer between sounds
|
||||
@@ -678,4 +678,4 @@ def pbGetTrainerVictoryME(trainer) # can be a PokeBattle_Trainer or an array o
|
||||
ret = pbStringToAudioFile("Battle victory") if !ret
|
||||
ret.name = "../../Audio/ME/"+ret.name
|
||||
return ret
|
||||
end
|
||||
end
|
||||
|
||||
@@ -253,7 +253,7 @@ def pbChoosePokemon(variableNumber,nameVarNumber,ableProc=nil,allowIneligible=fa
|
||||
scene = PokemonParty_Scene.new
|
||||
screen = PokemonPartyScreen.new(scene,$Trainer.party)
|
||||
if ableProc
|
||||
chosen=screen.pbChooseAblePokemon(ableProc,allowIneligible)
|
||||
chosen=screen.pbChooseAblePokemon(ableProc,allowIneligible)
|
||||
else
|
||||
screen.pbStartScene(_INTL("Choose a Pokémon."),false)
|
||||
chosen = screen.pbChoosePokemon
|
||||
@@ -283,7 +283,7 @@ def pbChooseTradablePokemon(variableNumber,nameVarNumber,ableProc=nil,allowIneli
|
||||
scene = PokemonParty_Scene.new
|
||||
screen = PokemonPartyScreen.new(scene,$Trainer.party)
|
||||
if ableProc
|
||||
chosen=screen.pbChooseTradablePokemon(ableProc,allowIneligible)
|
||||
chosen=screen.pbChooseTradablePokemon(ableProc,allowIneligible)
|
||||
else
|
||||
screen.pbStartScene(_INTL("Choose a Pokémon."),false)
|
||||
chosen = screen.pbChoosePokemon
|
||||
@@ -502,4 +502,4 @@ def pbHasEgg?(species)
|
||||
baby = pbGetBabySpecies(species,0,0)
|
||||
return true if species==baby # Is an egg species without incense
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
@@ -50,7 +50,7 @@ end
|
||||
|
||||
def pbGetCDID()
|
||||
sendString = proc { |x|
|
||||
mciSendString = Win32API.new('winmm','mciSendString','%w(p,p,l,l)','l')
|
||||
mciSendString = Win32API.new('winmm','mciSendString','%w(p,p,l,l)','l')
|
||||
next "" if !mciSendString
|
||||
buffer = "\0"*2000
|
||||
x = mciSendString.call(x,buffer,2000,0)
|
||||
@@ -193,7 +193,7 @@ def beginRecordUI
|
||||
buffer = "\0"*256
|
||||
MciErrorString.call(code,buffer,256)
|
||||
pbMessage(_INTL("Recording failed: {1}",buffer.gsub(/\x00/,"")))
|
||||
return false
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
@@ -266,10 +266,10 @@ class LinearCongRandom
|
||||
end
|
||||
|
||||
def getNext16 # calculates @seed * @s1 + @s2
|
||||
@seed = ((((@seed&0x0000ffff)*(@s1&0x0000ffff))&0x0000ffff) |
|
||||
(((((((@seed&0x0000ffff)*(@s1&0x0000ffff))&0xffff0000)>>16) +
|
||||
((((@seed&0xffff0000)>>16)*(@s1&0x0000ffff))&0x0000ffff) +
|
||||
(((@seed&0x0000ffff)*((@s1&0xffff0000)>>16))&0x0000ffff)) &
|
||||
@seed = ((((@seed&0x0000ffff)*(@s1&0x0000ffff))&0x0000ffff) |
|
||||
(((((((@seed&0x0000ffff)*(@s1&0x0000ffff))&0xffff0000)>>16) +
|
||||
((((@seed&0xffff0000)>>16)*(@s1&0x0000ffff))&0x0000ffff) +
|
||||
(((@seed&0x0000ffff)*((@s1&0xffff0000)>>16))&0x0000ffff)) &
|
||||
0x0000ffff)<<16)) + @s2
|
||||
r = (@seed>>16)
|
||||
r = (r+0xFFFFFFFF)+1 if r<0
|
||||
@@ -297,7 +297,7 @@ def pbIsJsonString(str)
|
||||
stringLiterals = /"[^"\\\n\r\x00-\x1f\x7f-\x9f]*"/ #"
|
||||
whiteSpace = /[\s]+/
|
||||
str = str.gsub(charEscapes,"@").gsub(stringLiterals,"true").gsub(whiteSpace," ")
|
||||
# prevent cases like "truetrue" or "true true" or "true[true]" or "5-2" or "5true"
|
||||
# prevent cases like "truetrue" or "true true" or "true[true]" or "5-2" or "5true"
|
||||
otherLiterals = /(true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)(?! ?[0-9a-z\-\[\{\"])/ #"
|
||||
str = str.gsub(otherLiterals,"]").gsub(d,"") #"
|
||||
return str[/^[\],:{} ]*$/] ? true : false
|
||||
@@ -708,7 +708,7 @@ def pbTrainerName(name=nil,outfit=0)
|
||||
if trname==nil
|
||||
trname = pbEnterPlayerName(_INTL("Your name?"),0,MAX_PLAYER_NAME_SIZE)
|
||||
if trname==""
|
||||
gender = pbGetTrainerTypeGender(trainertype)
|
||||
gender = pbGetTrainerTypeGender(trainertype)
|
||||
trname = pbSuggestTrainerName(gender)
|
||||
end
|
||||
end
|
||||
@@ -1045,7 +1045,7 @@ def pbMoveTutorChoose(move,movelist=nil,bymachine=false)
|
||||
end
|
||||
else
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
screen.pbEndScene
|
||||
}
|
||||
@@ -1199,4 +1199,4 @@ def pbRecordTrainer
|
||||
return true
|
||||
end
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user