The Great Enspacening begins!

This commit is contained in:
Maruno17
2021-12-18 12:20:31 +00:00
parent 2480ab0f9e
commit f7b76ae62e
138 changed files with 567 additions and 567 deletions

View File

@@ -44,7 +44,7 @@ class Battle::Peer
end
# For switching out, including due to fainting, and for the end of battle
def pbOnLeavingBattle(battle,pkmn,usedInBattle,endBattle=false)
def pbOnLeavingBattle(battle,pkmn,usedInBattle,endBattle = false)
return if !pkmn
f = MultipleForms.call("getFormOnLeavingBattle",pkmn,battle,usedInBattle,endBattle)
pkmn.form = f if f && pkmn.form!=f
@@ -58,7 +58,7 @@ end
#===============================================================================
class Battle::NullPeer
def pbOnEnteringBattle(battle, battler, pkmn, wild = false); end
def pbOnLeavingBattle(battle,pkmn,usedInBattle,endBattle=false); end
def pbOnLeavingBattle(battle,pkmn,usedInBattle,endBattle = false); end
def pbStorePokemon(player,pkmn)
player.party[player.party.length] = pkmn if !player.party_full?

View File

@@ -47,7 +47,7 @@ module Battle::CatchAndStoreMixin
#=============================================================================
# Throw a Poké Ball
#=============================================================================
def pbThrowPokeBall(idxBattler,ball,catch_rate=nil,showPlayer=false)
def pbThrowPokeBall(idxBattler,ball,catch_rate = nil,showPlayer = false)
# Determine which Pokémon you're throwing the Poké Ball at
battler = nil
if opposes?(idxBattler)

View File

@@ -22,7 +22,7 @@ class Battle
return __clauses__pbDecisionOnDraw
end
def pbJudgeCheckpoint(user,move=nil)
def pbJudgeCheckpoint(user,move = nil)
if pbAllFainted?(0) && pbAllFainted?(1)
if @rules["drawclause"] # NOTE: Also includes Life Orb (not implemented)
if !(move && move.function=="HealUserByHalfOfDamageDone")
@@ -62,7 +62,7 @@ class Battle::Battler
@__clauses__aliased = true
end
def pbCanSleep?(user,showMessages,move=nil,ignoreStatus=false)
def pbCanSleep?(user,showMessages,move = nil,ignoreStatus = false)
selfsleep = (user && user.index==@index)
if ((@battle.rules["modifiedsleepclause"]) || (!selfsleep && @battle.rules["sleepclause"])) &&
pbHasStatusPokemon?(:SLEEP)

View File

@@ -74,7 +74,7 @@ def isReversed(src0,src1,dst0,dst1)
return (dst0<dst1)
end
def pbCreateCel(x,y,pattern,focus=4)
def pbCreateCel(x,y,pattern,focus = 4)
frame = []
frame[AnimFrame::X] = x
frame[AnimFrame::Y] = y
@@ -256,7 +256,7 @@ class PBAnimTiming
attr_accessor :flashColor
attr_accessor :flashDuration
def initialize(type=0)
def initialize(type = 0)
@frame = 0
@timingType = type
@name = ""
@@ -358,7 +358,7 @@ class PBAnimations < Array
attr_reader :array
attr_accessor :selected
def initialize(size=1)
def initialize(size = 1)
@array = []
@selected = 0
size = 1 if size<1 # Always create at least one animation
@@ -433,7 +433,7 @@ class PBAnimation < Array
return @speed || 20
end
def initialize(size=1)
def initialize(size = 1)
@id = -1
@name = ""
@graphic = ""
@@ -494,7 +494,7 @@ class PBAnimation < Array
return @array[pos]
end
def playTiming(frame,bgGraphic,bgColor,foGraphic,foColor,oldbg=[],oldfo=[],user=nil)
def playTiming(frame,bgGraphic,bgColor,foGraphic,foColor,oldbg = [],oldfo = [],user = nil)
for i in @timing
next if i.frame!=frame
case i.timingType
@@ -617,7 +617,7 @@ end
#===============================================================================
#
#===============================================================================
def pbSpriteSetAnimFrame(sprite,frame,user=nil,target=nil,inEditor=false)
def pbSpriteSetAnimFrame(sprite,frame,user = nil,target = nil,inEditor = false)
return if !sprite
if !frame
sprite.visible = false
@@ -702,7 +702,7 @@ class PBAnimationPlayerX
MAX_SPRITES = 60
def initialize(animation,user,target,scene=nil,oppMove=false,inEditor=false)
def initialize(animation,user,target,scene = nil,oppMove = false,inEditor = false)
@animation = animation
@user = (oppMove) ? target : user # Just used for playing user's cry
@usersprite = (user) ? scene.sprites["pokemon_#{user.index}"] : nil