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

Mahogany gym trainers now notice player when standing next to them + adds referee that sends back the puck

Browse Source
This commit is contained in:
chardub
2025-02-17 15:01:14 -05:00
parent 4fa7292bdd
commit 1ddb9ba24a
6 changed files with 77 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Data/Map647.rxdata
View File

Binary file not shown.

BIN
Data/MapInfos.rxdata
View File

Binary file not shown.

16
Data/Scripts/012_Overworld/001_Overworld.rb
View File

@@ -411,10 +411,23 @@ def pbFacingTileRegular(direction = nil, event = nil)
return [$game_map.map_id, x + x_offset, y + y_offset]
end
def pbEventNextToPlayer?(event,player)
return false if !event || !player
return false if $PokemonGlobal.sliding
if event.x == player.x
return event.y == player.y+1 || event.y == player.y-1
elsif event.y == player.y
return event.x == player.x-1 || event.x == player.x+1
end
return false
end
# Returns whether event is in line with the player, is facing the player and is
# within distance tiles of the player.
def pbEventFacesPlayer?(event, player, distance)
return false if !event || !player || distance <= 0
return pbEventNextToPlayer?(event,player) if distance == 0
return false if !event || !player || distance < 0
x_min = x_max = y_min = y_max = -1
case event.direction
when 2 # Down
@@ -473,6 +486,7 @@ def pbFacingEachOther(event1, event2)
return pbEventFacesPlayer?(event1, event2, 1) && pbEventFacesPlayer?(event2, event1, 1)
end
#===============================================================================
# Audio playing
#===============================================================================

BIN
Data/System.rxdata
View File

Binary file not shown.

5
Data/sprites/sprites_rate_limit.log
View File

@@ -1,3 +1,2 @@
1739807996
1739807997
1739807997
1739822387
1739822387

60
Data/sprites/updated_spritesheets_cache
View File

@@ -271,3 +271,63 @@ Graphics/CustomBattlers/spritesheets/spritesheets_custom/449/449.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/412.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/392.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/392/392a.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/124.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/305/305.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/272/272a.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/388.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/249.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/249/249.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/332.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/76.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/76/76.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/200.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/455.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/263.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/49/49.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/366.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/366/366.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/334.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/138.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/117.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/38.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/145.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/145/145.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/315.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/315/315.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/244.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/133.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/133/133.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/465.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/154.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/338.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/338/338.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/115.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/115/115.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/177.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/177/177.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/222/222.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/316.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/229.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/229/229.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/297.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/297/297.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/105.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/105/105.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/437.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/68.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/68/68.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/453.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/44.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/44/44.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/250.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/250/250a.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/344.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/344/344.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/256.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/256/256a.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/186.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/9.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/141.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/141/141.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/301.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/301/301.png