DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-10 06:34: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

30
Data/Scripts/012_Battle/005_Battle scene/001_PokeBattle_Animation.rb
View File

@@ -65,21 +65,21 @@ module PokeBattle_BallAnimationMixin
# Poké Ball.
def getBattlerColorFromBallType(ballType)
case ballType
when 1; return Color.new(132, 189, 247) # Great Ball
when 2; return Color.new(189, 247, 165) # Safari Ball
when 3; return Color.new(255, 255, 123) # Ultra Ball
when 4; return Color.new(189, 165, 231) # Master Ball
when 5; return Color.new(173, 255, 206) # Net Ball
when 6; return Color.new( 99, 206, 247) # Dive Ball
when 7; return Color.new(247, 222, 82) # Nest Ball
when 8; return Color.new(255, 198, 132) # Repeat Ball
when 9; return Color.new(239, 247, 247) # Timer Ball
when 10; return Color.new(255, 140, 82) # Luxury Ball
when 11; return Color.new(255, 74, 82) # Premier Ball
when 12; return Color.new(115, 115, 140) # Dusk Ball
when 13; return Color.new(255, 198, 231) # Heal Ball
when 14; return Color.new(140, 214, 255) # Quick Ball
when 15; return Color.new(247, 66, 41) # Cherish Ball
when 1 then return Color.new(132, 189, 247) # Great Ball
when 2 then return Color.new(189, 247, 165) # Safari Ball
when 3 then return Color.new(255, 255, 123) # Ultra Ball
when 4 then return Color.new(189, 165, 231) # Master Ball
when 5 then return Color.new(173, 255, 206) # Net Ball
when 6 then return Color.new( 99, 206, 247) # Dive Ball
when 7 then return Color.new(247, 222, 82) # Nest Ball
when 8 then return Color.new(255, 198, 132) # Repeat Ball
when 9 then return Color.new(239, 247, 247) # Timer Ball
when 10 then return Color.new(255, 140, 82) # Luxury Ball
when 11 then return Color.new(255, 74, 82) # Premier Ball
when 12 then return Color.new(115, 115, 140) # Dusk Ball
when 13 then return Color.new(255, 198, 231) # Heal Ball
when 14 then return Color.new(140, 214, 255) # Quick Ball
when 15 then return Color.new(247, 66, 41) # Cherish Ball
end
return Color.new(255, 181, 247) # Poké Ball, Sport Ball, Apricorn Balls, others
end

6
Data/Scripts/012_Battle/005_Battle scene/002_PokeBattle_SceneAnimations.rb
View File

@@ -623,9 +623,9 @@ class BattlerDamageAnimation < PokeBattle_Animation
# Animation
delay = 0
case @effectiveness
when 0; battler.setSE(delay,"Battle damage normal")
when 1; battler.setSE(delay,"Battle damage weak")
when 2; battler.setSE(delay,"Battle damage super")
when 0 then battler.setSE(delay, "Battle damage normal")
when 1 then battler.setSE(delay, "Battle damage weak")
when 2 then battler.setSE(delay, "Battle damage super")
end
4.times do # 4 flashes, each lasting 0.2 (4/20) seconds
battler.setVisible(delay,false)

12
Data/Scripts/012_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb
View File

@@ -350,8 +350,8 @@ class PokemonDataBox < SpriteWrapper
# Data box bobbing while Pokémon is selected
if @selected==1 || @selected==2 # Choosing commands/targeted or damaged
case (frameCounter/QUARTER_ANIM_PERIOD).floor
when 1; self.y = @spriteY-2
when 3; self.y = @spriteY+2
when 1 then self.y = @spriteY-2
when 3 then self.y = @spriteY+2
end
end
end
@@ -574,8 +574,8 @@ class PokemonBattlerSprite < RPG::Sprite
@spriteYExtra = 0
if @selected==1 # When choosing commands for this Pokémon
case (frameCounter/QUARTER_ANIM_PERIOD).floor
when 1; @spriteYExtra = 2
when 3; @spriteYExtra = -2
when 1 then @spriteYExtra = 2
when 3 then @spriteYExtra = -2
end
end
self.x = self.x
@@ -584,8 +584,8 @@ class PokemonBattlerSprite < RPG::Sprite
# Pokémon sprite blinking when targeted
if @selected==2 && @spriteVisible
case (frameCounter/SIXTH_ANIM_PERIOD).floor
when 2, 5; self.visible = false
else; self.visible = true
when 2, 5 then self.visible = false
else self.visible = true
end
end
@updating = false

4
Data/Scripts/012_Battle/005_Battle scene/007_Scene_Initialize.rb
View File

@@ -93,8 +93,8 @@ class PokeBattle_Scene
def pbCreateBackdropSprites
case @battle.time
when 1; time = "eve"
when 2; time = "night"
when 1 then time = "eve"
when 2 then time = "night"
end
# Put everything together into backdrop, bases and message bar filenames
backdropFilename = @battle.backdrop