mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Corrected MapFactory#isPassable?
This commit is contained in:
@@ -168,19 +168,22 @@ class PokemonMapFactory
|
||||
return false if !map
|
||||
return false if !map.valid?(x, y)
|
||||
return true if thisEvent.through
|
||||
if thisEvent==$game_player
|
||||
# Check passability of tile
|
||||
if thisEvent.is_a?(Game_Player)
|
||||
return false unless ($DEBUG && Input.press?(Input::CTRL)) ||
|
||||
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
|
||||
for event in map.events.values
|
||||
next if event.x != x || event.y != y
|
||||
next if event.x != x || event.y != y || event == thisEvent
|
||||
return false if !event.through && event.character_name != ""
|
||||
end
|
||||
if thisEvent.is_a?(Game_Player)
|
||||
if thisEvent.x == x and thisEvent.y == y
|
||||
return false if !thisEvent.through && thisEvent.character_name!=""
|
||||
# Check passability of player
|
||||
if !thisEvent.is_a?(Game_Player)
|
||||
if $game_map.map_id == mapID && $game_player.x == x && $game_player.y == y
|
||||
return false if !$game_player.through && $game_player.character_name != ""
|
||||
end
|
||||
end
|
||||
return true
|
||||
|
||||
Reference in New Issue
Block a user