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

Added decent spacing to all scripts thanks to Rubocop

Browse Source
This commit is contained in:
Maruno17
2021-12-18 15:25:40 +00:00
parent f7b76ae62e
commit d17fc40a47
207 changed files with 18577 additions and 18587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/015_Trainers and player/001_Trainer.rb
View File

@@ -34,7 +34,7 @@ class Trainer
# Random ID other than this Trainer's ID
def make_foreign_ID
loop do
ret = rand(2 ** 16) | rand(2 ** 16) << 16
ret = rand(2**16) | rand(2**16) << 16
return ret if ret != @id
end
return 0
@@ -168,7 +168,7 @@ class Trainer
def initialize(name, trainer_type)
@trainer_type = GameData::TrainerType.get(trainer_type).id
@name = name
@id = rand(2 ** 16) | rand(2 ** 16) << 16
@id = rand(2**16) | rand(2**16) << 16
@language = pbGetLanguage
@party = []
end

2
Data/Scripts/015_Trainers and player/002_Trainer_LoadAndNew.rb
View File

@@ -13,7 +13,7 @@ def pbNewTrainer(tr_type, tr_name, tr_version, save_changes = true)
party = []
for i in 0...Settings::MAX_PARTY_SIZE
if i == 0
pbMessage(_INTL("Please enter the first Pokémon.",i))
pbMessage(_INTL("Please enter the first Pokémon.", i))
else
break if !pbConfirmMessage(_INTL("Add another Pokémon?"))
end

16
Data/Scripts/015_Trainers and player/003_Trainer_Sprites.rb
View File

@@ -2,7 +2,7 @@
# Walking charset, for use in text entry screens and load game screen
#===============================================================================
class TrainerWalkingCharSprite < SpriteWrapper
def initialize(charset,viewport = nil)
def initialize(charset, viewport = nil)
super(viewport)
@animbitmap = nil
self.charset = charset
@@ -14,12 +14,12 @@ class TrainerWalkingCharSprite < SpriteWrapper
def charset=(value)
@animbitmap.dispose if @animbitmap
@animbitmap = nil
bitmapFileName = sprintf("Graphics/Characters/%s",value)
bitmapFileName = sprintf("Graphics/Characters/%s", value)
@charset = pbResolveBitmap(bitmapFileName)
if @charset
@animbitmap = AnimatedBitmap.new(@charset)
self.bitmap = @animbitmap.bitmap
self.src_rect.set(0,0,self.bitmap.width/4,self.bitmap.height/4)
self.src_rect.set(0, 0, self.bitmap.width / 4, self.bitmap.height / 4)
else
self.bitmap = nil
end
@@ -32,14 +32,14 @@ class TrainerWalkingCharSprite < SpriteWrapper
if @charset
@animbitmap = AnimatedBitmap.new(@charset)
self.bitmap = @animbitmap.bitmap
self.src_rect.set(0,0,self.bitmap.width/4,self.bitmap.height)
self.src_rect.set(0, 0, self.bitmap.width / 4, self.bitmap.height)
else
self.bitmap = nil
end
end
def animspeed=(value)
@frameskip = value*Graphics.frame_rate/40
@frameskip = value * Graphics.frame_rate / 40
end
def dispose
@@ -55,9 +55,9 @@ class TrainerWalkingCharSprite < SpriteWrapper
self.bitmap = @animbitmap.bitmap
end
@frame += 1
if @frame>=@frameskip
@animframe = (@animframe+1)%4
self.src_rect.x = @animframe*@animbitmap.bitmap.width/4
if @frame >= @frameskip
@animframe = (@animframe + 1) % 4
self.src_rect.x = @animframe * @animbitmap.bitmap.width / 4
@frame -= @frameskip
end
@updating = false