mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2026-01-22 14:26:01 +00:00
Applied most Rubocop-suggested layout fixes
This commit is contained in:
@@ -167,6 +167,7 @@ class AnimationWindow < SpriteWrapper
|
||||
attr_reader :animbitmap
|
||||
attr_reader :start
|
||||
attr_reader :selected
|
||||
|
||||
NUMFRAMES=5
|
||||
|
||||
def initialize(x,y,width,height,viewport=nil)
|
||||
@@ -358,6 +359,7 @@ class SpriteFrame < InvalidatableSprite
|
||||
attr_reader :locked
|
||||
attr_reader :selected
|
||||
attr_reader :sprite
|
||||
|
||||
NUM_ROWS = (PBAnimation::MAX_SPRITES.to_f/10).ceil # 10 frame number icons in each row
|
||||
|
||||
def initialize(id,sprite,viewport,previous=false)
|
||||
@@ -431,6 +433,7 @@ class AnimationCanvas < Sprite
|
||||
attr_reader :animation # Currently selected animation
|
||||
attr_reader :animbitmap # Currently selected animation bitmap
|
||||
attr_accessor :pattern # Currently selected pattern
|
||||
|
||||
BORDERSIZE=64
|
||||
|
||||
def initialize(animation,viewport=nil)
|
||||
@@ -822,11 +825,11 @@ class AnimationCanvas < Sprite
|
||||
end
|
||||
currentFrame=getCurrentFrame
|
||||
if currentFrame && !@selecting &&
|
||||
(Input.triggerex?(:TAB) || Input.repeatex?(:TAB))
|
||||
(Input.triggerex?(:TAB) || Input.repeatex?(:TAB))
|
||||
currentFrame.length.times {
|
||||
@currentcel+=1
|
||||
@currentcel=0 if @currentcel>=currentFrame.length
|
||||
break if currentFrame[@currentcel]
|
||||
@currentcel+=1
|
||||
@currentcel=0 if @currentcel>=currentFrame.length
|
||||
break if currentFrame[@currentcel]
|
||||
}
|
||||
invalidate
|
||||
return
|
||||
|
||||
@@ -412,7 +412,7 @@ class Slider < UIControl
|
||||
self.changed=(self.curvalue!=oldvalue)
|
||||
self.invalidate
|
||||
end
|
||||
#Right arrow
|
||||
# Right arrow
|
||||
if right.contains(mousepos[0],mousepos[1])
|
||||
if repeattime>2500
|
||||
self.curvalue+=10
|
||||
|
||||
@@ -108,7 +108,7 @@ class PointPath
|
||||
return false if @points.length==0
|
||||
index=@points.length-1
|
||||
return @points[index][0]==x &&
|
||||
@points[index][1]==y
|
||||
@points[index][1]==y
|
||||
end
|
||||
|
||||
def addPoint(x,y)
|
||||
|
||||
@@ -44,7 +44,7 @@ end
|
||||
def pbImportAnim(animations,canvas,animwin)
|
||||
animfiles=[]
|
||||
pbRgssChdir(".") {
|
||||
animfiles.concat(Dir.glob("*.anm"))
|
||||
animfiles.concat(Dir.glob("*.anm"))
|
||||
}
|
||||
cmdwin=pbListWindow(animfiles,320)
|
||||
cmdwin.opacity=200
|
||||
|
||||
@@ -29,7 +29,7 @@ end
|
||||
def pbSelectAnim(canvas,animwin)
|
||||
animfiles=[]
|
||||
pbRgssChdir(File.join("Graphics", "Animations")) {
|
||||
animfiles.concat(Dir.glob("*.png"))
|
||||
animfiles.concat(Dir.glob("*.png"))
|
||||
}
|
||||
cmdwin=pbListWindow(animfiles,320)
|
||||
cmdwin.opacity=200
|
||||
@@ -518,10 +518,10 @@ def pbSelectSE(canvas,audio)
|
||||
animfiles=[]
|
||||
ret=false
|
||||
pbRgssChdir(File.join("Audio", "SE", "Anim")) {
|
||||
animfiles.concat(Dir.glob("*.wav"))
|
||||
# animfiles.concat(Dir.glob("*.mp3"))
|
||||
animfiles.concat(Dir.glob("*.ogg"))
|
||||
animfiles.concat(Dir.glob("*.wma"))
|
||||
animfiles.concat(Dir.glob("*.wav"))
|
||||
# animfiles.concat(Dir.glob("*.mp3"))
|
||||
animfiles.concat(Dir.glob("*.ogg"))
|
||||
animfiles.concat(Dir.glob("*.wma"))
|
||||
}
|
||||
animfiles.sort! { |a,b| a.upcase<=>b.upcase }
|
||||
animfiles=[_INTL("[Play user's cry]")]+animfiles
|
||||
@@ -950,11 +950,11 @@ end
|
||||
|
||||
def pbAnimEditorHelpWindow
|
||||
helptext=""+
|
||||
"To add a cel to the scene, click on the canvas. The selected cel will have a black "+
|
||||
"frame. After a cel is selected, you can modify its properties using the keyboard:\n"+
|
||||
"E, R - Rotate left/right.\nP - Open properties screen.\nArrow keys - Move cel 8 pixels "+
|
||||
"(hold ALT for 2 pixels).\n+/- : Zoom in/out.\nL - Lock a cel. Locking a cel prevents it "+
|
||||
"from being moved or deleted.\nDEL - Deletes the cel.\nAlso press TAB to switch the selected cel."
|
||||
"To add a cel to the scene, click on the canvas. The selected cel will have a black "+
|
||||
"frame. After a cel is selected, you can modify its properties using the keyboard:\n"+
|
||||
"E, R - Rotate left/right.\nP - Open properties screen.\nArrow keys - Move cel 8 pixels "+
|
||||
"(hold ALT for 2 pixels).\n+/- : Zoom in/out.\nL - Lock a cel. Locking a cel prevents it "+
|
||||
"from being moved or deleted.\nDEL - Deletes the cel.\nAlso press TAB to switch the selected cel."
|
||||
cmdwin=Window_UnformattedTextPokemon.newWithSize("",0,0,640,512)
|
||||
cmdwin.opacity=224
|
||||
cmdwin.z=99999
|
||||
|
||||
Reference in New Issue
Block a user