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

Rubocop-inspired style tweaks

Browse Source
This commit is contained in:
Maruno17
2020-09-06 01:10:02 +01:00
parent 5073f86190
commit 6c4670eaa3
7 changed files with 329 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/001_Settings.rb
View File

@@ -87,8 +87,8 @@ NO_SIGNPOSTS = []
# * The maximum length, in characters, that the player's name can be.
#===============================================================================
INITIAL_MONEY = 3000
MAX_MONEY = 999999
MAX_COINS = 99999
MAX_MONEY = 999_999
MAX_COINS = 99_999
MAX_PLAYER_NAME_SIZE = 10
#===============================================================================

21
Data/Scripts/001_Technical/001_Ruby Utilities.rb
View File

@@ -7,8 +7,6 @@ class Class
end
end
#===============================================================================
# module Comparable
#===============================================================================
@@ -23,8 +21,6 @@ unless Comparable.method_defined? :clamp
end
end
#===============================================================================
# class Boolean
#===============================================================================
@@ -34,21 +30,19 @@ class Boolean
end
end
#===============================================================================
# class String
#===============================================================================
class String
def starts_with?(str)
proc = (self[0...str.length] == str) if self.length >= str.length
return proc ? proc : false
return proc || false
end
def ends_with?(str)
e = self.length - 1
proc = (self[(e-str.length)...e] == str) if self.length >= str.length
return proc ? proc : false
return proc || false
end
def starts_with_vowel?
@@ -110,8 +104,6 @@ class String
end
end
#===============================================================================
# class Numeric
#===============================================================================
@@ -122,8 +114,6 @@ class Numeric
end
end
#===============================================================================
# class Integer
#===============================================================================
@@ -131,12 +121,10 @@ class Integer
# Returns an array containing each digit of the number in turn.
def digits(base = 10)
quotient, remainder = divmod(base)
(quotient==0) ? [remainder] : quotient.digits(base).push(remainder)
return (quotient == 0) ? [remainder] : quotient.digits(base).push(remainder)
end
end
#===============================================================================
# class Array
#===============================================================================
@@ -166,7 +154,6 @@ class Array
end unless method_defined? :shuffle!
end
#===============================================================================
# module Enumerable
#===============================================================================
@@ -178,8 +165,6 @@ module Enumerable
end
end
#===============================================================================
# Kernel methods
#===============================================================================

132
Data/Scripts/018_Minigames/001_PMinigame_Duel.rb
View File

@@ -1,54 +1,53 @@
################################################################################
#===============================================================================
# "Duel" mini-game
# Based on the Duel minigame by Alael
################################################################################
begin
#===============================================================================
class DuelWindow < Window_AdvancedTextPokemon
attr_accessor :hp
attr_accessor :name
attr_accessor :isEnemy
attr_reader :hp
attr_reader :name
attr_reader :is_enemy
def initialize(name,isEnemy)
def initialize(name, is_enemy)
@hp = 10
@name = name
@isEnemy = isEnemy
super("")
@is_enemy = is_enemy
super()
self.width = 160
self.height = 96
duelRefresh
duel_refresh
end
def hp=(value)
@hp = value
duelRefresh
duel_refresh
end
def name=(value)
@name = value
duelRefresh
duel_refresh
end
def isEnemy=(value)
@isEnemy = value
duelRefresh
def is_enemy=(value)
@is_enemy = value
duel_refresh
end
def duelRefresh
nameColor = @isEnemy ? "<ar><c3=E00808,F8B870>" : "<c3=3050C8,A0C0F0>"
hpColor = "<c3=209808,90F090>"
self.text = _INTL("{1}{2}\r\n{3}HP: {4}",nameColor,fmtescape(@name),hpColor,@hp)
def duel_refresh
name_color = @is_enemy ? "<ar><c3=E00808,F8B870>" : "<c3=3050C8,A0C0F0>"
hp_color = "<c3=209808,90F090>"
self.text = _INTL("{1}{2}\r\n{3}HP: {4}", name_color, fmtescape(@name), hp_color, @hp)
end
end
#===============================================================================
#
#===============================================================================
class PokemonDuel
def pbStartDuel(opponent, event)
@event = event
@viewport = Viewport.new(0, 0, Graphics.width, Graphics.height)
@viewport.z = 99999
@sprites = {}
@event = event
@sprites["player"] = IconSprite.new(-128 - 32, 96, @viewport)
@sprites["player"].setBitmap(pbTrainerSpriteFile($Trainer.trainertype))
@sprites["opponent"] = IconSprite.new(Graphics.width + 32, 96, @viewport)
@@ -60,12 +59,12 @@ class PokemonDuel
@sprites["opponentwindow"].x = Graphics.width
@sprites["opponentwindow"].viewport = @viewport
pbWait(Graphics.frame_rate / 2)
distancePerFrame = 8*20/Graphics.frame_rate
distance_per_frame = 8 * 20 / Graphics.frame_rate
while @sprites["player"].x < 0
@sprites["player"].x += distancePerFrame
@sprites["playerwindow"].x += distancePerFrame
@sprites["opponent"].x -= distancePerFrame
@sprites["opponentwindow"].x -= distancePerFrame
@sprites["player"].x += distance_per_frame
@sprites["playerwindow"].x += distance_per_frame
@sprites["opponent"].x -= distance_per_frame
@sprites["opponentwindow"].x -= distandistance_per_framecePerFrame
Graphics.update
Input.update
pbUpdateSceneMap
@@ -117,19 +116,14 @@ class PokemonDuel
end
@special[1] = true if action == 3
pbMessage(_INTL("{1}: {2}", opponent.name, speeches[action * 3 + rand(3)]))
command = rand(4)
list = [
_INTL("DEFEND"),
_INTL("PRECISE ATTACK"),
_INTL("FIERCE ATTACK")
]
if !@special[0]
list.push(_INTL("SPECIAL ATTACK"))
end
list.push(_INTL("SPECIAL ATTACK")) if !@special[0]
command = pbMessage(_INTL("Choose a command."), list, 0)
if command==3
@special[0] = true
end
@special[0] = true if command == 3
if action == 0 && command == 0
pbMoveRoute($game_player, [
PBMoveRoute::ScriptAsync, "moveRight90",
@@ -320,15 +314,15 @@ class PokemonDuel
pbMoveRoute(@event, [
PBMoveRoute::DirectionFixOff,
PBMoveRoute::ChangeSpeed, @oldeventspeed])
fadeTime = Graphics.frame_rate*4/10
alphaDiff = (255.0/fadeTime).ceil
fadeTime.times do
@sprites["player"].opacity -= alphaDiff
@sprites["opponent"].opacity -= alphaDiff
@sprites["playerwindow"].contents_opacity -= alphaDiff
@sprites["opponentwindow"].contents_opacity -= alphaDiff
@sprites["playerwindow"].opacity -= alphaDiff
@sprites["opponentwindow"].opacity -= alphaDiff
fade_time = Graphics.frame_rate * 4 / 10
alpha_diff = (255.0 / fade_time).ceil
fade_time.times do
@sprites["player"].opacity -= alpha_diff
@sprites["opponent"].opacity -= alpha_diff
@sprites["playerwindow"].contents_opacity -= alpha_diff
@sprites["opponentwindow"].contents_opacity -= alpha_diff
@sprites["playerwindow"].opacity -= alpha_diff
@sprites["opponentwindow"].opacity -= alpha_diff
Graphics.update
Input.update
pbUpdateSceneMap
@@ -339,31 +333,31 @@ class PokemonDuel
def pbFlashScreens(player, opponent)
i = 0
flashTime = Graphics.frame_rate*2/10
alphaDiff = (2*255.0/flashTime).ceil
flashTime.times do
flash_time = Graphics.frame_rate * 2 / 10
alpha_diff = (2 * 255.0 / flash_time).ceil
flash_time.times do
i += 1
if player
@sprites["player"].color = Color.new(255,255,255,i*alphaDiff)
@sprites["playerwindow"].color = Color.new(255,255,255,i*alphaDiff)
@sprites["player"].color = Color.new(255, 255, 255, i * alpha_diff)
@sprites["playerwindow"].color = Color.new(255, 255, 255, i * alpha_diff)
end
if opponent
@sprites["opponent"].color = Color.new(255,255,255,i*alphaDiff)
@sprites["opponentwindow"].color = Color.new(255,255,255,i*alphaDiff)
@sprites["opponent"].color = Color.new(255, 255, 255, i * alpha_diff)
@sprites["opponentwindow"].color = Color.new(255, 255, 255, i * alpha_diff)
end
Graphics.update
Input.update
pbUpdateSceneMap
end
flashTime.times do
flash_time.times do
i -= 1
if player
@sprites["player"].color = Color.new(255,255,255,i*alphaDiff)
@sprites["playerwindow"].color = Color.new(255,255,255,i*alphaDiff)
@sprites["player"].color = Color.new(255, 255, 255, i * alpha_diff)
@sprites["playerwindow"].color = Color.new(255, 255, 255, i * alpha_diff)
end
if opponent
@sprites["opponent"].color = Color.new(255,255,255,i*alphaDiff)
@sprites["opponentwindow"].color = Color.new(255,255,255,i*alphaDiff)
@sprites["opponent"].color = Color.new(255, 255, 255, i * alpha_diff)
@sprites["opponentwindow"].color = Color.new(255, 255, 255, i * alpha_diff)
end
Graphics.update
Input.update
@@ -379,29 +373,19 @@ class PokemonDuel
end
end
# Starts a duel.
# trainerid - ID or symbol of the opponent's trainer type.
# trainername - Name of the opponent
# trainer_id - ID or symbol of the opponent's trainer type.
# trainer_name - Name of the opponent
# event - Game_Event object for the character's event
# speeches - Array of 12 speeches
def pbDuel(trainerID,trainerName,event,speeches)
trainerID = getID(PBTrainers,trainerID)
def pbDuel(trainer_id, trainer_name, event, speeches)
trainer_id = getID(PBTrainers, trainer_id)
duel = PokemonDuel.new
opponent = PokeBattle_Trainer.new(
pbGetMessageFromHash(MessageTypes::TrainerNames,trainerName),trainerID)
speechTexts = []
pbGetMessageFromHash(MessageTypes::TrainerNames,trainer_name), trainer_id)
speech_texts = []
for i in 0...12
speechTexts.push(_I(speeches[i]))
end
duel.pbDuel(opponent,event,speechTexts)
end
rescue Exception
if $!.is_a?(SystemExit) || "#{$!.class}"=="Reset"
raise $!
speech_texts.push(_I(speeches[i]))
end
duel.pbDuel(opponent, event, speech_texts)
end

15
Data/Scripts/018_Minigames/002_PMinigame_TripleTriad.rb
View File

@@ -261,7 +261,6 @@ class TriadScene
preview.y = 60
preview.z = 4
index = -1
chosenSprites = []
for i in 0...@battle.maxCards
@sprites["player#{i}"] = Sprite.new(@viewport)
@sprites["player#{i}"].x = Graphics.width-92
@@ -443,9 +442,8 @@ class TriadScene
return choice
end
def pbPlayerPlaceCard(card,cardIndex)
def pbPlayerPlaceCard(cardIndex)
@sprites["helpwindow"].text = _INTL("Place the card.")
choice = 0
boardX = 0
boardY = 0
doRefresh = true
@@ -733,9 +731,10 @@ class TriadScreen
for i in 0...@width*@height
square = TriadSquare.new
if @elements
begin
loop do
square.type = rand(PBTypes.maxValue+1)
end until !PBTypes.isPseudoType?(square.type)
break if !PBTypes.isPseudoType?(square.type)
end
end
@board.push(square)
end
@@ -793,7 +792,7 @@ class TriadScreen
minIndex = minLevel*20
maxIndex = maxLevel*20+20
opponentCards = []
for i in 0...self.maxCards
self.maxCards.times do
# generate random card based on level
index = minIndex+rand(maxIndex-minIndex)
opponentCards.push(candidates[index][0])
@@ -821,7 +820,7 @@ class TriadScreen
while !position
cardIndex = @scene.pbPlayerChooseCard(cards.length)
triadCard = TriadCard.new(cards[cardIndex])
position = @scene.pbPlayerPlaceCard(triadCard,cardIndex)
position = @scene.pbPlayerPlaceCard(cardIndex)
end
else
# Opponent's turn
@@ -990,7 +989,7 @@ end
# Card storage
#===============================================================================
class PokemonGlobalMetadata
attr_accessor :triads
attr_writer :triads
def triads
@triads = TriadStorage.new if !@triads

6
Data/Scripts/018_Minigames/004_PMinigame_VoltorbFlip.rb
View File

@@ -431,7 +431,7 @@ class VoltorbFlip
# Create and split a string for the number, with padded 0s
zeroes=2-num.to_s.length
numText=""
for j in 0...zeroes
zeroes.times do
numText+="0"
end
numText+=num.to_s
@@ -449,7 +449,7 @@ class VoltorbFlip
# Create and split a string for the number, with padded 0s
zeroes=2-num.to_s.length
numText=""
for j in 0...zeroes
zeroes.times do
numText+="0"
end
numText+=num.to_s
@@ -466,7 +466,7 @@ class VoltorbFlip
def pbCreateCoins(source,y)
zeroes=5-source.to_s.length
coinText=""
for i in 0...zeroes
zeroes.times do
coinText+="0"
end
coinText+=source.to_s

2
Data/Scripts/018_Minigames/005_PMinigame_Lottery.rb
View File

@@ -32,7 +32,7 @@ def pbLottery(winnum,nameVar=2,positionVar=3,matchedVar=4)
winmatched=thismatched
end
end
pbEachPokemon { |poke,box|
pbEachPokemon { |poke,_box|
thismatched=0
id=poke.publicID
for j in 0...5

4
Data/Scripts/018_Minigames/006_PMinigame_Mining.rb
View File

@@ -339,8 +339,6 @@ class MiningGameScene
prepattern=ITEMS[i[0]][6]
next if provx+provwidth<=prex || provx>=prex+prewidth ||
provy+provheight<=prey || provy>=prey+preheight
dx=prex-provx
dy=prey-provy
for j in 0...prepattern.length
next if prepattern[j]==0
xco=prex+(j%prewidth)
@@ -359,8 +357,6 @@ class MiningGameScene
prepattern=IRON[i[0]][4]
next if provx+provwidth<=prex || provx>=prex+prewidth ||
provy+provheight<=prey || provy>=prey+preheight
dx=prex-provx
dy=prey-provy
for j in 0...prepattern.length
next if prepattern[j]==0
xco=prex+(j%prewidth)