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

Fixed being unable to walk across a map connection into an event even while holding Ctrl in Debug mode

Browse Source
This commit is contained in:
Maruno17
2022-06-17 21:41:22 +01:00
parent cd47b9899c
commit d42e35f8c4
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Data/Scripts/004_Game classes/006_Game_MapFactory.rb
View File

@@ -168,12 +168,8 @@ class PokemonMapFactory
return false if !map.valid?(x, y) return false if !map.valid?(x, y)
return true if thisEvent.through return true if thisEvent.through
# Check passability of tile # Check passability of tile
if thisEvent.is_a?(Game_Player) return true if $DEBUG && Input.press?(Input::CTRL) && thisEvent.is_a?(Game_Player)
return false unless ($DEBUG && Input.press?(Input::CTRL)) || return false if !map.passable?(x, y, 0, thisEvent)
map.passable?(x, y, 0, thisEvent)
else
return false unless map.passable?(x, y, 0, thisEvent)
end
# Check passability of event(s) in that spot # Check passability of event(s) in that spot
map.events.each_value do |event| map.events.each_value do |event|
next if event == thisEvent || !event.at_coordinate?(x, y) next if event == thisEvent || !event.at_coordinate?(x, y)
@@ -188,20 +184,15 @@ class PokemonMapFactory
return true return true
end end
# Only used by dependent events # Only used by follower events
def isPassableStrict?(mapID, x, y, thisEvent = nil) def isPassableStrict?(mapID, x, y, thisEvent = nil)
thisEvent = $game_player if !thisEvent thisEvent = $game_player if !thisEvent
map = getMapNoAdd(mapID) map = getMapNoAdd(mapID)
return false if !map return false if !map
return false if !map.valid?(x, y) return false if !map.valid?(x, y)
return true if thisEvent.through return true if thisEvent.through
if thisEvent == $game_player return true if $DEBUG && Input.press?(Input::CTRL) && thisEvent.is_a?(Game_Player)
if !($DEBUG && Input.press?(Input::CTRL)) && !map.passableStrict?(x, y, 0, thisEvent) return false if !map.passableStrict?(x, y, 0, thisEvent)
return false
end
elsif !map.passableStrict?(x, y, 0, thisEvent)
return false
end
map.events.each_value do |event| map.events.each_value do |event|
next if event == thisEvent || !event.at_coordinate?(x, y) next if event == thisEvent || !event.at_coordinate?(x, y)
return false if !event.through && event.character_name != "" return false if !event.through && event.character_name != ""
@@ -229,10 +220,7 @@ class PokemonMapFactory
def areConnected?(mapID1, mapID2) def areConnected?(mapID1, mapID2)
return true if mapID1 == mapID2 return true if mapID1 == mapID2
MapFactoryHelper.eachConnectionForMap(mapID1) do |conn| return MapFactoryHelper.mapsConnected?(mapID1, mapID2)
return true if conn[0] == mapID2 || conn[3] == mapID2
end
return false
end end
# Returns the coordinate change to go from this position to other position # Returns the coordinate change to go from this position to other position