DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +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

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

@@ -155,32 +155,35 @@ class PokemonMapFactory
end end
# Similar to Game_Player#passable?, but supports map connections # Similar to Game_Player#passable?, but supports map connections
def isPassableFromEdge?(x,y) def isPassableFromEdge?(x, y)
return true if $game_map.valid?(x,y) return true if $game_map.valid?(x, y)
newmap = getNewMap(x,y) newmap = getNewMap(x, y)
return false if !newmap return false if !newmap
return isPassable?(newmap[0].map_id,newmap[1],newmap[2]) return isPassable?(newmap[0].map_id, newmap[1], newmap[2])
end end
def isPassable?(mapID,x,y,thisEvent=nil) def isPassable?(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 # Check passability of tile
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
for event in map.events.values
next if event.x != x || event.y != y
return false if !event.through && event.character_name!=""
end
if thisEvent.is_a?(Game_Player) if thisEvent.is_a?(Game_Player)
if thisEvent.x == x and thisEvent.y == y return false unless ($DEBUG && Input.press?(Input::CTRL)) ||
return false if !thisEvent.through && thisEvent.character_name!="" 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 || event == thisEvent
return false if !event.through && event.character_name != ""
end
# 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
end end
return true return true