mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 13:44:59 +00:00
Fixed previous commit always causing recompiling if shadow_pokemon.dat doesn't exist, also rubocopping
This commit is contained in:
@@ -25,16 +25,12 @@ def pbPokerus?
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
|
||||
class Game_Temp
|
||||
attr_accessor :warned_low_battery
|
||||
attr_accessor :cue_bgm
|
||||
attr_accessor :cue_bgm_frame_delay
|
||||
end
|
||||
|
||||
|
||||
|
||||
def pbBatteryLow?
|
||||
pstate = System.power_state
|
||||
# If it's not discharging, it doesn't matter if it's low
|
||||
@@ -220,8 +216,6 @@ def pbBattleOnStepTaken(repel_active)
|
||||
$game_temp.force_single_battle = false
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Checks when moving between maps
|
||||
#===============================================================================
|
||||
@@ -331,8 +325,6 @@ EventHandlers.add(:on_map_or_spriteset_change, :show_location_window,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Event locations, terrain tags
|
||||
#===============================================================================
|
||||
@@ -416,8 +408,6 @@ def pbFacingEachOther(event1, event2)
|
||||
return pbEventFacesPlayer?(event1, event2, 1) && pbEventFacesPlayer?(event2, event1, 1)
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Audio playing
|
||||
#===============================================================================
|
||||
@@ -454,8 +444,6 @@ def pbAutoplayOnSave
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Event movement
|
||||
#===============================================================================
|
||||
@@ -473,8 +461,8 @@ module PBMoveRoute
|
||||
AwayFromPlayer = 11
|
||||
Forward = 12
|
||||
Backward = 13
|
||||
Jump = 14 # xoffset, yoffset
|
||||
Wait = 15 # frames
|
||||
Jump = 14 # xoffset, yoffset
|
||||
Wait = 15 # frames
|
||||
TurnDown = 16
|
||||
TurnLeft = 17
|
||||
TurnRight = 18
|
||||
@@ -486,10 +474,10 @@ module PBMoveRoute
|
||||
TurnRandom = 24
|
||||
TurnTowardPlayer = 25
|
||||
TurnAwayFromPlayer = 26
|
||||
SwitchOn = 27 # 1 param
|
||||
SwitchOff = 28 # 1 param
|
||||
ChangeSpeed = 29 # 1 param
|
||||
ChangeFreq = 30 # 1 param
|
||||
SwitchOn = 27 # 1 param
|
||||
SwitchOff = 28 # 1 param
|
||||
ChangeSpeed = 29 # 1 param
|
||||
ChangeFreq = 30 # 1 param
|
||||
WalkAnimeOn = 31
|
||||
WalkAnimeOff = 32
|
||||
StepAnimeOn = 33
|
||||
@@ -500,16 +488,14 @@ module PBMoveRoute
|
||||
ThroughOff = 38
|
||||
AlwaysOnTopOn = 39
|
||||
AlwaysOnTopOff = 40
|
||||
Graphic = 41 # Name, hue, direction, pattern
|
||||
Opacity = 42 # 1 param
|
||||
Blending = 43 # 1 param
|
||||
PlaySE = 44 # 1 param
|
||||
Script = 45 # 1 param
|
||||
ScriptAsync = 101 # 1 param
|
||||
Graphic = 41 # Name, hue, direction, pattern
|
||||
Opacity = 42 # 1 param
|
||||
Blending = 43 # 1 param
|
||||
PlaySE = 44 # 1 param
|
||||
Script = 45 # 1 param
|
||||
ScriptAsync = 101 # 1 param
|
||||
end
|
||||
|
||||
|
||||
|
||||
def pbMoveRoute(event, commands, waitComplete = false)
|
||||
route = RPG::MoveRoute.new
|
||||
route.repeat = false
|
||||
@@ -555,8 +541,6 @@ def pbWait(numFrames)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Player/event movement in the field
|
||||
#===============================================================================
|
||||
@@ -644,8 +628,6 @@ def pbJumpToward(dist = 1, playSound = false, cancelSurf = false)
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Bridges, cave escape points, and setting the heal point
|
||||
#===============================================================================
|
||||
@@ -689,8 +671,6 @@ def pbSetPokemonCenter
|
||||
$PokemonGlobal.pokecenterDirection = $game_player.direction
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Partner trainer
|
||||
#===============================================================================
|
||||
@@ -710,8 +690,6 @@ def pbDeregisterPartner
|
||||
$PokemonGlobal.partner = nil
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Picking up an item found on the ground
|
||||
#===============================================================================
|
||||
@@ -752,8 +730,6 @@ def pbItemBall(item, quantity = 1)
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
|
||||
#===============================================================================
|
||||
# Being given an item
|
||||
#===============================================================================
|
||||
|
||||
Reference in New Issue
Block a user