DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2026-01-31 10:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Corrected MapFactory#isPassable?

Browse Source
This commit is contained in:
Maruno17
2020-09-09 20:30:43 +01:00
parent 3e1c482c21
commit 925c12c831
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Data/Scripts/003_Game classes/011_MapFactory.rb
View File

@@ -168,19 +168,22 @@ class PokemonMapFactory
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 # Check passability of tile
if thisEvent.is_a?(Game_Player)
return false unless ($DEBUG && Input.press?(Input::CTRL)) || return false unless ($DEBUG && Input.press?(Input::CTRL)) ||
map.passable?(x, y, 0, thisEvent) map.passable?(x, y, 0, thisEvent)
else else
return false unless map.passable?(x, y, 0, thisEvent) return false unless map.passable?(x, y, 0, thisEvent)
end end
# Check passability of event(s) in that spot
for event in map.events.values 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 != "" return false if !event.through && event.character_name != ""
end end
if thisEvent.is_a?(Game_Player) # Check passability of player
if thisEvent.x == x and thisEvent.y == y if !thisEvent.is_a?(Game_Player)
return false if !thisEvent.through && thisEvent.character_name!="" 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
end end
return true return true