mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Fixed being able to Fly in the Town Map despite the Setting, fixed being unable to interact with an event next to you if standing on an event
This commit is contained in:
@@ -294,8 +294,12 @@ module Settings
|
||||
# * Species.
|
||||
# * Level.
|
||||
# * Game Switch; the Pokémon roams while this is ON.
|
||||
# * Encounter type (0=any, 1=grass/walking in cave, 2=surfing, 3=fishing,
|
||||
# 4=surfing/fishing). See the bottom of Overworld_RoamingPokemon for lists.
|
||||
# * Encounter type (see def pbRoamingMethodAllowed for their use):
|
||||
# 0 = grass, walking in cave, surfing
|
||||
# 1 = grass, walking in cave
|
||||
# 2 = surfing
|
||||
# 3 = fishing
|
||||
# 4 = surfing, fishing
|
||||
# * Name of BGM to play for that encounter (optional).
|
||||
# * Roaming areas specifically for this Pokémon (optional).
|
||||
ROAMING_SPECIES = [
|
||||
|
||||
@@ -316,13 +316,15 @@ class Game_Player < Game_Character
|
||||
def pbCheckEventTriggerAfterTurning; end
|
||||
|
||||
def pbCheckEventTriggerFromDistance(triggers)
|
||||
ret = pbTriggeredTrainerEvents(triggers)
|
||||
ret.concat(pbTriggeredCounterEvents(triggers))
|
||||
return false if ret.length == 0
|
||||
ret.each do |event|
|
||||
events = pbTriggeredTrainerEvents(triggers)
|
||||
events.concat(pbTriggeredCounterEvents(triggers))
|
||||
return false if events.length == 0
|
||||
ret = false
|
||||
events.each do |event|
|
||||
event.start
|
||||
ret = true if event.starting
|
||||
end
|
||||
return true
|
||||
return ret
|
||||
end
|
||||
|
||||
# Trigger event(s) at the same coordinates as self with the appropriate
|
||||
@@ -339,7 +341,7 @@ class Game_Player < Game_Character
|
||||
# If starting determinant is same position event (other than jumping)
|
||||
next if event.jumping? || !event.over_trigger?
|
||||
event.start
|
||||
result = true
|
||||
result = true if event.starting
|
||||
end
|
||||
return result
|
||||
end
|
||||
@@ -361,7 +363,7 @@ class Game_Player < Game_Character
|
||||
# If starting determinant is front event (other than jumping)
|
||||
next if event.jumping? || event.over_trigger?
|
||||
event.start
|
||||
result = true
|
||||
result = true if event.starting
|
||||
end
|
||||
# If fitting event is not found
|
||||
if result == false && $game_map.counter?(new_x, new_y)
|
||||
@@ -377,7 +379,7 @@ class Game_Player < Game_Character
|
||||
# If starting determinant is front event (other than jumping)
|
||||
next if event.jumping? || event.over_trigger?
|
||||
event.start
|
||||
result = true
|
||||
result = true if event.starting
|
||||
end
|
||||
end
|
||||
return result
|
||||
@@ -404,7 +406,7 @@ class Game_Player < Game_Character
|
||||
# If starting determinant is front event (other than jumping)
|
||||
next if event.jumping? || event.over_trigger?
|
||||
event.start
|
||||
result = true
|
||||
result = true if event.starting
|
||||
end
|
||||
return result
|
||||
end
|
||||
|
||||
@@ -308,7 +308,8 @@ class PokemonRegionMap_Scene
|
||||
end
|
||||
elsif Input.trigger?(Input::USE) && @editor # Intentionally after other USE input check
|
||||
pbChangeMapLocation(@map_x, @map_y)
|
||||
elsif Input.trigger?(Input::ACTION) && !@wallmap && !@fly_map && pbCanFly?
|
||||
elsif Input.trigger?(Input::ACTION) && Settings::CAN_FLY_FROM_TOWN_MAP &&
|
||||
!@wallmap && !@fly_map && pbCanFly?
|
||||
pbPlayDecisionSE
|
||||
@mode = (@mode == 1) ? 0 : 1
|
||||
refresh_fly_screen
|
||||
|
||||
Reference in New Issue
Block a user