DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed rendering of some tiles for certain sizes of tilesets, more rubocopping

Browse Source
This commit is contained in:
Maruno17
2023-04-12 21:14:26 +01:00
parent 956a511ec5
commit a714086a39
42 changed files with 392 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/003_Move/004_Move_BaseEffects.rb
View File

@@ -406,7 +406,7 @@ end
# Recoil move.
#===============================================================================
class Battle::Move::RecoilMove < Battle::Move
def recoilMove?; return true; end
def recoilMove?; return true; end
def pbRecoilDamage(user, target); return 1; end
def pbEffectAfterAllHits(user, target)

2
Data/Scripts/011_Battle/003_Move/010_MoveEffects_Healing.rb
View File

@@ -488,7 +488,7 @@ end
# User faints, even if the move does nothing else. (Explosion, Self-Destruct)
#===============================================================================
class Battle::Move::UserFaintsExplosive < Battle::Move
def worksWithNoTargets?; return true; end
def worksWithNoTargets?; return true; end
def pbNumHits(user, targets); return 1; end
def pbMoveFailed?(user, targets)

4
Data/Scripts/011_Battle/003_Move/011_MoveEffects_Items.rb
View File

@@ -169,8 +169,8 @@ class Battle::Move::RemoveTargetItem < Battle::Move
def pbBaseDamage(baseDmg, user, target)
if Settings::MECHANICS_GENERATION >= 6 &&
target.item && !target.unlosableItem?(target.item)
# NOTE: Damage is still boosted even if target has Sticky Hold or a
# substitute.
# NOTE: Damage is still boosted even if target has Sticky Hold or a
# substitute.
baseDmg = (baseDmg * 1.5).round
end
return baseDmg

8
Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb
View File

@@ -213,16 +213,14 @@ class Battle::Scene::PokemonDataBox < Sprite
nameWidth = self.bitmap.text_size(@battler.name).width
nameOffset = 0
nameOffset = nameWidth - 116 if nameWidth > 116
pbDrawTextPositions(self.bitmap,
[[@battler.name, @spriteBaseX + 8 - nameOffset, 12, :left, NAME_BASE_COLOR, NAME_SHADOW_COLOR]]
pbDrawTextPositions(self.bitmap, [[@battler.name, @spriteBaseX + 8 - nameOffset, 12, :left,
NAME_BASE_COLOR, NAME_SHADOW_COLOR]]
)
end
def draw_level
# "Lv" graphic
pbDrawImagePositions(self.bitmap,
[["Graphics/UI/Battle/overlay_lv", @spriteBaseX + 140, 16]]
)
pbDrawImagePositions(self.bitmap, [["Graphics/UI/Battle/overlay_lv", @spriteBaseX + 140, 16]])
# Level number
pbDrawNumber(@battler.level, self.bitmap, @spriteBaseX + 162, 16)
end

2
Data/Scripts/011_Battle/004_Scene/007_Battle_Scene_BaseAnimation.rb
View File

@@ -446,7 +446,7 @@ module Battle::Scene::Animation::BallAnimationMixin
particle.moveDelta(start, particle_lifetime, max_radius * Math.cos(radian), max_radius * Math.sin(radian))
particle.moveZoom(start, particle_lifetime, 10)
particle.moveTone(start + particle_lifetime - particle_fade_duration,
particle_fade_duration / 2, variances[7 - (3 * num)])
particle_fade_duration / 2, variances[7 - (3 * num)])
particle.moveOpacity(start + particle_lifetime - particle_fade_duration,
particle_fade_duration,
0) # Fade out at end