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

Lots of rubocop

Browse Source
This commit is contained in:
Maruno17
2023-01-28 15:21:12 +00:00
parent 2d056052ce
commit 13aab8d911
159 changed files with 1679 additions and 1931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

186
Data/Scripts/017_Minigames/001_Minigame_Duel.rb
View File

@@ -72,11 +72,11 @@ class PokemonDuel
@oldmovespeed = $game_player.move_speed
@oldeventspeed = event.move_speed
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 2,
PBMoveRoute::DirectionFixOn])
[PBMoveRoute::CHANGE_SPEED, 2,
PBMoveRoute::DIRECTION_FIX_ON])
pbMoveRoute(event,
[PBMoveRoute::ChangeSpeed, 2,
PBMoveRoute::DirectionFixOn])
[PBMoveRoute::CHANGE_SPEED, 2,
PBMoveRoute::DIRECTION_FIX_ON])
pbWait(Graphics.frame_rate * 3 / 4)
end
@@ -126,177 +126,177 @@ class PokemonDuel
@special[0] = true if command == 3
if action == 0 && command == 0
pbMoveRoute($game_player,
[PBMoveRoute::ScriptAsync, "moveRight90",
PBMoveRoute::ScriptAsync, "moveLeft90",
PBMoveRoute::ScriptAsync, "moveLeft90",
PBMoveRoute::ScriptAsync, "moveRight90"])
[PBMoveRoute::SCRIPT_ASYNC, "moveRight90",
PBMoveRoute::SCRIPT_ASYNC, "moveLeft90",
PBMoveRoute::SCRIPT_ASYNC, "moveLeft90",
PBMoveRoute::SCRIPT_ASYNC, "moveRight90"])
pbMoveRoute(event,
[PBMoveRoute::ScriptAsync, "moveLeft90",
PBMoveRoute::ScriptAsync, "moveRight90",
PBMoveRoute::ScriptAsync, "moveRight90",
PBMoveRoute::ScriptAsync, "moveLeft90"])
[PBMoveRoute::SCRIPT_ASYNC, "moveLeft90",
PBMoveRoute::SCRIPT_ASYNC, "moveRight90",
PBMoveRoute::SCRIPT_ASYNC, "moveRight90",
PBMoveRoute::SCRIPT_ASYNC, "moveLeft90"])
pbWait(Graphics.frame_rate / 2)
pbMessage(_INTL("You study each other's movements..."))
elsif action == 0 && command == 1
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 4,
PBMoveRoute::Forward])
[PBMoveRoute::CHANGE_SPEED, 4,
PBMoveRoute::FORWARD])
pbWait(Graphics.frame_rate * 4 / 10)
pbShake(9, 9, 8)
pbFlashScreens(false, true)
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 2,
PBMoveRoute::Backward])
[PBMoveRoute::CHANGE_SPEED, 2,
PBMoveRoute::BACKWARD])
@hp[1] -= 1
pbMessage(_INTL("Your attack was not blocked!"))
elsif action == 0 && command == 2
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 4,
PBMoveRoute::ScriptAsync, "jumpForward"])
[PBMoveRoute::CHANGE_SPEED, 4,
PBMoveRoute::SCRIPT_ASYNC, "jumpForward"])
pbMoveRoute(event,
[PBMoveRoute::ChangeSpeed, 4,
PBMoveRoute::Backward])
[PBMoveRoute::CHANGE_SPEED, 4,
PBMoveRoute::BACKWARD])
pbWait(Graphics.frame_rate)
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 2,
PBMoveRoute::Backward])
[PBMoveRoute::CHANGE_SPEED, 2,
PBMoveRoute::BACKWARD])
pbMoveRoute(event,
[PBMoveRoute::ChangeSpeed, 2,
PBMoveRoute::Forward])
[PBMoveRoute::CHANGE_SPEED, 2,
PBMoveRoute::FORWARD])
pbMessage(_INTL("Your attack was evaded!"))
elsif [0, 1, 2].include?(action) && command == 3
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 4,
PBMoveRoute::ScriptAsync, "jumpForward"])
[PBMoveRoute::CHANGE_SPEED, 4,
PBMoveRoute::SCRIPT_ASYNC, "jumpForward"])
pbWait(Graphics.frame_rate * 4 / 10)
pbMoveRoute(event,
[PBMoveRoute::ChangeSpeed, 5,
PBMoveRoute::Backward,
PBMoveRoute::ChangeSpeed, 2])
[PBMoveRoute::CHANGE_SPEED, 5,
PBMoveRoute::BACKWARD,
PBMoveRoute::CHANGE_SPEED, 2])
pbWait(Graphics.frame_rate / 2)
pbShake(9, 9, 8)
pbFlashScreens(false, true)
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 2,
PBMoveRoute::Backward])
[PBMoveRoute::CHANGE_SPEED, 2,
PBMoveRoute::BACKWARD])
pbMoveRoute(event,
[PBMoveRoute::ChangeSpeed, 2,
PBMoveRoute::Forward])
[PBMoveRoute::CHANGE_SPEED, 2,
PBMoveRoute::FORWARD])
@hp[1] -= 3
pbMessage(_INTL("You pierce through the opponent's defenses!"))
elsif action == 1 && command == 0
pbMoveRoute(event,
[PBMoveRoute::ChangeSpeed, 4,
PBMoveRoute::Forward])
[PBMoveRoute::CHANGE_SPEED, 4,
PBMoveRoute::FORWARD])
pbWait(Graphics.frame_rate * 4 / 10)
pbShake(9, 9, 8)
pbFlashScreens(true, false)
pbMoveRoute(event,
[PBMoveRoute::ChangeSpeed, 2,
PBMoveRoute::Backward])
[PBMoveRoute::CHANGE_SPEED, 2,
PBMoveRoute::BACKWARD])
@hp[0] -= 1
pbMessage(_INTL("You fail to block the opponent's attack!"))
elsif action == 1 && command == 1
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 4,
PBMoveRoute::Forward])
[PBMoveRoute::CHANGE_SPEED, 4,
PBMoveRoute::FORWARD])
pbWait(Graphics.frame_rate * 6 / 10)
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 2,
PBMoveRoute::Backward])
[PBMoveRoute::CHANGE_SPEED, 2,
PBMoveRoute::BACKWARD])
pbMoveRoute(event,
[PBMoveRoute::ChangeSpeed, 2,
PBMoveRoute::Forward])
[PBMoveRoute::CHANGE_SPEED, 2,
PBMoveRoute::FORWARD])
pbWait(Graphics.frame_rate * 6 / 10)
pbMoveRoute(event, [PBMoveRoute::Backward])
pbMoveRoute($game_player, [PBMoveRoute::Forward])
pbMoveRoute(event, [PBMoveRoute::BACKWARD])
pbMoveRoute($game_player, [PBMoveRoute::FORWARD])
pbWait(Graphics.frame_rate * 6 / 10)
pbMoveRoute($game_player, [PBMoveRoute::Backward])
pbMoveRoute($game_player, [PBMoveRoute::BACKWARD])
pbMessage(_INTL("You cross blades with the opponent!"))
elsif (action == 1 && command == 2) ||
(action == 2 && command == 1) ||
(action == 2 && command == 2)
pbMoveRoute($game_player,
[PBMoveRoute::Backward,
PBMoveRoute::ChangeSpeed, 4,
PBMoveRoute::ScriptAsync, "jumpForward"])
[PBMoveRoute::BACKWARD,
PBMoveRoute::CHANGE_SPEED, 4,
PBMoveRoute::SCRIPT_ASYNC, "jumpForward"])
pbWait(Graphics.frame_rate * 8 / 10)
pbMoveRoute(event,
[PBMoveRoute::ChangeSpeed, 4,
PBMoveRoute::Forward])
[PBMoveRoute::CHANGE_SPEED, 4,
PBMoveRoute::FORWARD])
pbWait(Graphics.frame_rate * 9 / 10)
pbShake(9, 9, 8)
pbFlashScreens(true, true)
pbMoveRoute($game_player,
[PBMoveRoute::Backward,
PBMoveRoute::ChangeSpeed, 2])
[PBMoveRoute::BACKWARD,
PBMoveRoute::CHANGE_SPEED, 2])
pbMoveRoute(event,
[PBMoveRoute::Backward,
PBMoveRoute::Backward,
PBMoveRoute::ChangeSpeed, 2])
[PBMoveRoute::BACKWARD,
PBMoveRoute::BACKWARD,
PBMoveRoute::CHANGE_SPEED, 2])
pbWait(Graphics.frame_rate)
pbMoveRoute(event, [PBMoveRoute::Forward])
pbMoveRoute($game_player, [PBMoveRoute::Forward])
pbMoveRoute(event, [PBMoveRoute::FORWARD])
pbMoveRoute($game_player, [PBMoveRoute::FORWARD])
@hp[0] -= action # Enemy action
@hp[1] -= command # Player command
pbMessage(_INTL("You hit each other!"))
elsif action == 2 && command == 0
pbMoveRoute(event,
[PBMoveRoute::ChangeSpeed, 4,
PBMoveRoute::Forward])
[PBMoveRoute::CHANGE_SPEED, 4,
PBMoveRoute::FORWARD])
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 4,
PBMoveRoute::ScriptAsync, "jumpBackward"])
[PBMoveRoute::CHANGE_SPEED, 4,
PBMoveRoute::SCRIPT_ASYNC, "jumpBackward"])
pbWait(Graphics.frame_rate)
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 2,
PBMoveRoute::Forward])
[PBMoveRoute::CHANGE_SPEED, 2,
PBMoveRoute::FORWARD])
pbMoveRoute(event,
[PBMoveRoute::ChangeSpeed, 2,
PBMoveRoute::Backward])
[PBMoveRoute::CHANGE_SPEED, 2,
PBMoveRoute::BACKWARD])
pbMessage(_INTL("You evade the opponent's attack!"))
elsif action == 3 && [0, 1, 2].include?(command)
pbMoveRoute(event,
[PBMoveRoute::ChangeSpeed, 4,
PBMoveRoute::ScriptAsync, "jumpForward"])
[PBMoveRoute::CHANGE_SPEED, 4,
PBMoveRoute::SCRIPT_ASYNC, "jumpForward"])
pbWait(Graphics.frame_rate * 4 / 10)
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 5,
PBMoveRoute::Backward,
PBMoveRoute::ChangeSpeed, 2])
[PBMoveRoute::CHANGE_SPEED, 5,
PBMoveRoute::BACKWARD,
PBMoveRoute::CHANGE_SPEED, 2])
pbWait(Graphics.frame_rate / 2)
pbShake(9, 9, 8)
pbFlashScreens(true, false)
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 2,
PBMoveRoute::Forward])
[PBMoveRoute::CHANGE_SPEED, 2,
PBMoveRoute::FORWARD])
pbMoveRoute(event,
[PBMoveRoute::ChangeSpeed, 2,
PBMoveRoute::Backward])
[PBMoveRoute::CHANGE_SPEED, 2,
PBMoveRoute::BACKWARD])
@hp[0] -= 3
pbMessage(_INTL("The opponent pierces through your defenses!"))
elsif action == 3 && command == 3
pbMoveRoute($game_player, [PBMoveRoute::Backward])
pbMoveRoute($game_player, [PBMoveRoute::BACKWARD])
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 4,
PBMoveRoute::ScriptAsync, "jumpForward"])
[PBMoveRoute::CHANGE_SPEED, 4,
PBMoveRoute::SCRIPT_ASYNC, "jumpForward"])
pbMoveRoute(event,
[PBMoveRoute::Wait, 15,
PBMoveRoute::ChangeSpeed, 4,
PBMoveRoute::ScriptAsync, "jumpForward"])
[PBMoveRoute::WAIT, 15,
PBMoveRoute::CHANGE_SPEED, 4,
PBMoveRoute::SCRIPT_ASYNC, "jumpForward"])
pbWait(Graphics.frame_rate)
pbMoveRoute(event,
[PBMoveRoute::ChangeSpeed, 5,
PBMoveRoute::Backward,
PBMoveRoute::ChangeSpeed, 2])
[PBMoveRoute::CHANGE_SPEED, 5,
PBMoveRoute::BACKWARD,
PBMoveRoute::CHANGE_SPEED, 2])
pbMoveRoute($game_player,
[PBMoveRoute::ChangeSpeed, 5,
PBMoveRoute::Backward,
PBMoveRoute::ChangeSpeed, 2])
[PBMoveRoute::CHANGE_SPEED, 5,
PBMoveRoute::BACKWARD,
PBMoveRoute::CHANGE_SPEED, 2])
pbShake(9, 9, 8)
pbFlash(Color.new(255, 255, 255, 255), 20)
pbFlashScreens(true, true)
pbMoveRoute($game_player, [PBMoveRoute::Forward])
pbMoveRoute($game_player, [PBMoveRoute::FORWARD])
@hp[0] -= 4
@hp[1] -= 4
pbMessage(_INTL("Your special attacks collide!"))
@@ -309,11 +309,11 @@ class PokemonDuel
def pbEndDuel
pbWait(Graphics.frame_rate * 3 / 4)
pbMoveRoute($game_player,
[PBMoveRoute::DirectionFixOff,
PBMoveRoute::ChangeSpeed, @oldmovespeed])
[PBMoveRoute::DIRECTION_FIX_OFF,
PBMoveRoute::CHANGE_SPEED, @oldmovespeed])
pbMoveRoute(@event,
[PBMoveRoute::DirectionFixOff,
PBMoveRoute::ChangeSpeed, @oldeventspeed])
[PBMoveRoute::DIRECTION_FIX_OFF,
PBMoveRoute::CHANGE_SPEED, @oldeventspeed])
fade_time = Graphics.frame_rate * 4 / 10
alpha_diff = (255.0 / fade_time).ceil
fade_time.times do
@@ -382,7 +382,7 @@ def pbDuel(trainer_id, trainer_name, event, speeches)
trainer_id = GameData::TrainerType.get(trainer_id).id
duel = PokemonDuel.new
opponent = NPCTrainer.new(
pbGetMessageFromHash(MessageTypes::TrainerNames, trainer_name), trainer_id
pbGetMessageFromHash(MessageTypes::TRAINER_NAMES, trainer_name), trainer_id
)
speech_texts = []
12.times do |i|

72
Data/Scripts/017_Minigames/002_Minigame_TripleTriad.rb
View File

@@ -293,8 +293,8 @@ class TriadScene
item = chosenCards.pop
@battle.pbAdd(cardStorage, item)
commands = []
cardStorage.each do |item|
commands.push(_INTL("{1} x{2}", GameData::Species.get(item[0]).name, item[1]))
cardStorage.each do |itm|
commands.push(_INTL("{1} x{2}", GameData::Species.get(itm[0]).name, itm[1]))
end
command.commands = commands
index = -1
@@ -315,8 +315,8 @@ class TriadScene
chosenCards.push(item[0])
@battle.pbSubtract(cardStorage, item[0])
commands = []
cardStorage.each do |item|
commands.push(_INTL("{1} x{2}", GameData::Species.get(item[0]).name, item[1]))
cardStorage.each do |itm|
commands.push(_INTL("{1} x{2}", GameData::Species.get(itm[0]).name, itm[1]))
end
command.commands = commands
command.index = commands.length - 1 if command.index >= commands.length
@@ -762,10 +762,10 @@ class TriadScreen
# Set the opponent's cards.
if oppdeck.is_a?(Array) && oppdeck.length == self.maxCards # Preset
opponentCards = []
oppdeck.each do |i|
species_data = GameData::Species.try_get(i)
oppdeck.each do |species|
species_data = GameData::Species.try_get(species)
if !species_data
@scene.pbDisplayPaused(_INTL("Opponent has an illegal card, \"{1}\".", i))
@scene.pbDisplayPaused(_INTL("Opponent has an illegal card, \"{1}\".", species))
@scene.pbEndScene
return 0
end
@@ -819,16 +819,16 @@ class TriadScreen
# Opponent's turn
@scene.pbDisplay(_INTL("{1} is making a move...", @opponentName))
scores = []
opponentCards.length.times do |cardIndex|
opponentCards.length.times do |cardIdx|
square = TriadSquare.new
square.card = TriadCard.new(opponentCards[cardIndex])
square.card = TriadCard.new(opponentCards[cardIdx])
square.owner = 2
(@width * @height).times do |i|
x = i % @width
y = i / @width
square.type = @board[i].type
(@width * @height).times do |j|
x = j % @width
y = j / @width
square.type = @board[j].type
flips = flipBoard(x, y, square)
scores.push([cardIndex, x, y, flips.length]) if flips
scores.push([cardIdx, x, y, flips.length]) if flips
end
end
# Sort by number of flips
@@ -875,16 +875,12 @@ class TriadScreen
result = 3
if @trade == 1
# Keep only cards of your color
originalCards.each do |card|
$PokemonGlobal.triads.remove(card)
end
cards.each do |i|
$PokemonGlobal.triads.add(i)
end
originalCards.each { |crd| $PokemonGlobal.triads.remove(crd) }
cards.each { |crd| $PokemonGlobal.triads.add(crd) }
(@width * @height).times do |i|
if board[i].owner == 1
card = GameData::Species.get_species_form(board[i].card.species, board[i].card.form).id
$PokemonGlobal.triads.add(card)
crd = GameData::Species.get_species_form(board[i].card.species, board[i].card.form).id
$PokemonGlobal.triads.add(crd)
end
end
@scene.pbDisplayPaused(_INTL("Kept all cards of your color."))
@@ -906,12 +902,8 @@ class TriadScreen
@scene.pbDisplayPaused(_INTL("Got opponent's {1} card.", cardname))
end
when 1 # Keep only cards of your color
originalCards.each do |card|
$PokemonGlobal.triads.remove(card)
end
cards.each do |i|
$PokemonGlobal.triads.add(i)
end
originalCards.each { |crd| $PokemonGlobal.triads.remove(crd) }
cards.each { |crd| $PokemonGlobal.triads.add(crd) }
(@width * @height).times do |i|
if board[i].owner == 1
card = GameData::Species.get_species_form(board[i].card.species, board[i].card.form).id
@@ -920,9 +912,7 @@ class TriadScreen
end
@scene.pbDisplayPaused(_INTL("Kept all cards of your color."))
when 2 # Gain all opponent's cards
originalOpponentCards.each do |card|
$PokemonGlobal.triads.add(card)
end
originalOpponentCards.each { |crd| $PokemonGlobal.triads.add(crd) }
@scene.pbDisplayPaused(_INTL("Got all opponent's cards."))
end
end
@@ -936,12 +926,8 @@ class TriadScreen
cardname = GameData::Species.get(card).name
@scene.pbDisplayPaused(_INTL("Opponent won your {1} card.", cardname))
when 1 # Keep only cards of your color
originalCards.each do |card|
$PokemonGlobal.triads.remove(card)
end
cards.each do |i|
$PokemonGlobal.triads.add(i)
end
originalCards.each { |crd| $PokemonGlobal.triads.remove(card) }
cards.each { |crd| $PokemonGlobal.triads.add(crd) }
(@width * @height).times do |i|
if board[i].owner == 1
card = GameData::Species.get_species_form(board[i].card.species, board[i].card.form).id
@@ -950,9 +936,7 @@ class TriadScreen
end
@scene.pbDisplayPaused(_INTL("Kept all cards of your color.", cardname))
when 2 # Lose all your cards
originalCards.each do |card|
$PokemonGlobal.triads.remove(card)
end
originalCards.each { |crd| $PokemonGlobal.triads.remove(crd) }
@scene.pbDisplayPaused(_INTL("Opponent won all your cards."))
end
end
@@ -971,11 +955,11 @@ end
def pbTriadDuel(name, minLevel, maxLevel, rules = nil, oppdeck = nil, prize = nil)
ret = 0
pbFadeOutInWithMusic {
pbFadeOutInWithMusic do
scene = TriadScene.new
screen = TriadScreen.new(scene)
ret = screen.pbStartScreen(name, minLevel, maxLevel, rules, oppdeck, prize)
}
end
return ret
end
@@ -1198,9 +1182,7 @@ def pbSellTriads
item = $PokemonGlobal.triads.get_item(cmdwindow.index)
if olditem != item
preview.bitmap&.dispose
if item
preview.bitmap = TriadCard.new(item).createBitmap(1)
end
preview.bitmap = TriadCard.new(item).createBitmap(1) if item
olditem = item
end
if Input.trigger?(Input::BACK)

4
Data/Scripts/017_Minigames/003_Minigame_SlotMachine.rb
View File

@@ -404,10 +404,10 @@ def pbSlotMachine(difficulty = 1)
elsif $player.coins == Settings::MAX_COINS
pbMessage(_INTL("Your Coin Case is full!"))
else
pbFadeOutIn {
pbFadeOutIn do
scene = SlotMachineScene.new
screen = SlotMachine.new(scene)
screen.pbStartScreen(difficulty)
}
end
end
end

8
Data/Scripts/017_Minigames/004_Minigame_VoltorbFlip.rb
View File

@@ -351,9 +351,7 @@ class VoltorbFlip
end
count = 0
@squares.length.times do |i|
if @squares[i][3] == false && @squares[i][2] > 1
count += 1
end
count += 1 if @squares[i][3] == false && @squares[i][2] > 1
end
pbUpdateCoins
# Game cleared
@@ -561,9 +559,7 @@ class VoltorbFlip
Graphics.update
Input.update
update
if @sprites["curtainL"].angle >= -90
break
end
break if @sprites["curtainL"].angle >= -90
end
pbFadeOutAndHide(@sprites) { update }
pbDisposeSpriteHash(@sprites)

4
Data/Scripts/017_Minigames/005_Minigame_Lottery.rb
View File

@@ -28,7 +28,7 @@ def pbLottery(winnum, nameVar = 2, positionVar = 3, matchedVar = 4)
winpos = 1 # Party
winmatched = thismatched
end
pbEachPokemon { |poke, _box|
pbEachPokemon do |poke, _box|
thismatched = 0
id = poke.owner.public_id
5.times do |j|
@@ -39,7 +39,7 @@ def pbLottery(winnum, nameVar = 2, positionVar = 3, matchedVar = 4)
winpoke = poke.name
winpos = 2 # Storage
winmatched = thismatched
}
end
$game_variables[nameVar] = winpoke
$game_variables[positionVar] = winpos
$game_variables[matchedVar] = winmatched

4
Data/Scripts/017_Minigames/006_Minigame_Mining.rb
View File

@@ -628,9 +628,9 @@ end
#
#===============================================================================
def pbMiningGame
pbFadeOutIn {
pbFadeOutIn do
scene = MiningGameScene.new
screen = MiningGame.new(scene)
screen.pbStartScreen
}
end
end

4
Data/Scripts/017_Minigames/007_Minigame_TilePuzzles.rb
View File

@@ -585,10 +585,10 @@ end
#===============================================================================
def pbTilePuzzle(game, board, width = 0, height = 0)
ret = false
pbFadeOutIn {
pbFadeOutIn do
scene = TilePuzzleScene.new(game, board, width, height)
screen = TilePuzzle.new(scene)
ret = screen.pbStartScreen
}
end
return ret
end