mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-09 22:24:58 +00:00
Fixed previous commit always causing recompiling if shadow_pokemon.dat doesn't exist, also rubocopping
This commit is contained in:
@@ -133,8 +133,6 @@ class TriadCard
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Duel screen visuals
|
||||
#===============================================================================
|
||||
@@ -160,9 +158,9 @@ class TriadSquare
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Scene class for handling appearance of the screen
|
||||
#===============================================================================
|
||||
class TriadScene
|
||||
def pbStartScene(battle)
|
||||
@sprites = {}
|
||||
@@ -589,8 +587,6 @@ class TriadScene
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Duel screen logic
|
||||
#===============================================================================
|
||||
@@ -965,8 +961,6 @@ class TriadScreen
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Start duel
|
||||
#===============================================================================
|
||||
@@ -985,8 +979,6 @@ def pbTriadDuel(name, minLevel, maxLevel, rules = nil, oppdeck = nil, prize = ni
|
||||
return ret
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Card storage
|
||||
#===============================================================================
|
||||
@@ -1001,8 +993,9 @@ class PokemonGlobalMetadata
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
class TriadStorage
|
||||
attr_reader :items
|
||||
|
||||
@@ -1066,8 +1059,6 @@ class TriadStorage
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Card shop screen
|
||||
#===============================================================================
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
################################################################################
|
||||
#===============================================================================
|
||||
# "Slot Machine" mini-game
|
||||
# By Maruno
|
||||
#-------------------------------------------------------------------------------
|
||||
# Run with: pbSlotMachine(1)
|
||||
# - The number is either 0 (easy), 1 (default) or 2 (hard).
|
||||
################################################################################
|
||||
#===============================================================================
|
||||
class SlotMachineReel < BitmapSprite
|
||||
attr_accessor :reel
|
||||
attr_accessor :toppos
|
||||
@@ -79,8 +79,9 @@ class SlotMachineReel < BitmapSprite
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
class SlotMachineScore < BitmapSprite
|
||||
attr_reader :score
|
||||
|
||||
@@ -107,8 +108,9 @@ class SlotMachineScore < BitmapSprite
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
class SlotMachineScene
|
||||
attr_accessor :gameRunning
|
||||
attr_accessor :gameEnd
|
||||
@@ -376,8 +378,9 @@ class SlotMachineScene
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
class SlotMachine
|
||||
def initialize(scene)
|
||||
@scene = scene
|
||||
@@ -390,8 +393,9 @@ class SlotMachine
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
def pbSlotMachine(difficulty = 1)
|
||||
if !$bag.has?(:COINCASE)
|
||||
pbMessage(_INTL("It's a Slot Machine."))
|
||||
|
||||
@@ -580,8 +580,9 @@ class VoltorbFlip
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
class VoltorbFlipScreen
|
||||
def initialize(scene)
|
||||
@scene = scene
|
||||
@@ -594,8 +595,9 @@ class VoltorbFlipScreen
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
def pbVoltorbFlip
|
||||
if !$bag.has?(:COINCASE)
|
||||
pbMessage(_INTL("You can't play unless you have a Coin Case."))
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
################################################################################
|
||||
#===============================================================================
|
||||
# "Mining" mini-game
|
||||
# By Maruno
|
||||
#-------------------------------------------------------------------------------
|
||||
# Run with: pbMiningGame
|
||||
################################################################################
|
||||
#===============================================================================
|
||||
class MiningGameCounter < BitmapSprite
|
||||
attr_accessor :hits
|
||||
|
||||
@@ -32,8 +32,9 @@ class MiningGameCounter < BitmapSprite
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
class MiningGameTile < BitmapSprite
|
||||
attr_reader :layer
|
||||
|
||||
@@ -70,8 +71,9 @@ class MiningGameTile < BitmapSprite
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
class MiningGameCursor < BitmapSprite
|
||||
attr_accessor :mode
|
||||
attr_accessor :position
|
||||
@@ -138,8 +140,9 @@ class MiningGameCursor < BitmapSprite
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
class MiningGameScene
|
||||
BOARD_WIDTH = 13
|
||||
BOARD_HEIGHT = 10
|
||||
@@ -606,8 +609,9 @@ class MiningGameScene
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
class MiningGame
|
||||
def initialize(scene)
|
||||
@scene = scene
|
||||
@@ -620,8 +624,9 @@ class MiningGame
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
def pbMiningGame
|
||||
pbFadeOutIn {
|
||||
scene = MiningGameScene.new
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
################################################################################
|
||||
#===============================================================================
|
||||
# "Tile Puzzle" mini-games
|
||||
# By Maruno
|
||||
# Graphics by the__end
|
||||
@@ -14,7 +14,7 @@
|
||||
# board = The name/number of the graphics to be used.
|
||||
# width,height = Optional, the number of tiles wide/high the puzzle is (0 for
|
||||
# the default value of 4).
|
||||
################################################################################
|
||||
#===============================================================================
|
||||
class TilePuzzleCursor < BitmapSprite
|
||||
attr_accessor :game
|
||||
attr_accessor :position
|
||||
@@ -83,8 +83,9 @@ class TilePuzzleCursor < BitmapSprite
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
class TilePuzzleScene
|
||||
def initialize(game, board, width, height)
|
||||
@game = game
|
||||
@@ -563,8 +564,9 @@ class TilePuzzleScene
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
class TilePuzzle
|
||||
def initialize(scene)
|
||||
@scene = scene
|
||||
@@ -578,8 +580,9 @@ class TilePuzzle
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
#
|
||||
#===============================================================================
|
||||
def pbTilePuzzle(game, board, width = 0, height = 0)
|
||||
ret = false
|
||||
pbFadeOutIn {
|
||||
|
||||
Reference in New Issue
Block a user