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

Added "Sight(x)" event name snippet

Browse Source
This commit is contained in:
Maruno17
2022-05-18 19:32:28 +01:00
parent 04f3b29fe3
commit d7f4434000
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/004_Game classes/008_Game_Event.rb
View File

@@ -142,7 +142,7 @@ class Game_Event < Game_Character
def pbCheckEventTriggerAfterTurning def pbCheckEventTriggerAfterTurning
return if $game_system.map_interpreter.running? || @starting return if $game_system.map_interpreter.running? || @starting
return if @trigger != 2 # Event touch return if @trigger != 2 # Event touch
return if !@event.name[/trainer\((\d+)\)/i] return if !@event.name[/(?:sight|trainer)\((\d+)\)/i]
distance = $~[1].to_i distance = $~[1].to_i
return if !pbEventCanReachPlayer?(self, $game_player, distance) return if !pbEventCanReachPlayer?(self, $game_player, distance)
return if jumping? || over_trigger? return if jumping? || over_trigger?

6
Data/Scripts/004_Game classes/009_Game_Player.rb
View File

@@ -183,14 +183,14 @@ class Game_Player < Game_Character
triggerLeaveTile triggerLeaveTile
end end
def pbTriggeredTrainerEvents(triggers, checkIfRunning = true) def pbTriggeredTrainerEvents(triggers, checkIfRunning = true, trainer_only = false)
result = [] result = []
# If event is running # If event is running
return result if checkIfRunning && $game_system.map_interpreter.running? return result if checkIfRunning && $game_system.map_interpreter.running?
# All event loops # All event loops
$game_map.events.each_value do |event| $game_map.events.each_value do |event|
next if !triggers.include?(event.trigger) next if !triggers.include?(event.trigger)
next if !event.name[/trainer\((\d+)\)/i] next if !event.name[/trainer\((\d+)\)/i] && (trainer_only || !event.name[/sight\((\d+)\)/i])
distance = $~[1].to_i distance = $~[1].to_i
next if !pbEventCanReachPlayer?(event, self, distance) next if !pbEventCanReachPlayer?(event, self, distance)
next if event.jumping? || event.over_trigger? next if event.jumping? || event.over_trigger?
@@ -398,7 +398,7 @@ class Game_Player < Game_Character
next if ![1, 2].include?(event.trigger) # Player touch, event touch next if ![1, 2].include?(event.trigger) # Player touch, event touch
# If event coordinates and triggers are consistent # If event coordinates and triggers are consistent
next if !event.at_coordinate?(@x + x_offset, @y + y_offset) next if !event.at_coordinate?(@x + x_offset, @y + y_offset)
if event.name[/trainer\((\d+)\)/i] if event.name[/(?:sight|trainer)\((\d+)\)/i]
distance = $~[1].to_i distance = $~[1].to_i
next if !pbEventCanReachPlayer?(event, self, distance) next if !pbEventCanReachPlayer?(event, self, distance)
elsif event.name[/counter\((\d+)\)/i] elsif event.name[/counter\((\d+)\)/i]

2
Data/Scripts/012_Overworld/002_Battle triggering/001_Overworld_BattleStarting.rb
View File

@@ -441,7 +441,7 @@ class TrainerBattle
if !$game_temp.waiting_trainer && pbMapInterpreterRunning? && pbCanDoubleBattle? if !$game_temp.waiting_trainer && pbMapInterpreterRunning? && pbCanDoubleBattle?
thisEvent = pbMapInterpreter.get_self thisEvent = pbMapInterpreter.get_self
# Find all other triggered trainer events # Find all other triggered trainer events
triggeredEvents = $game_player.pbTriggeredTrainerEvents([2], false) triggeredEvents = $game_player.pbTriggeredTrainerEvents([2], false, true)
otherEvent = [] otherEvent = []
triggeredEvents.each do |i| triggeredEvents.each do |i|
next if i.id == thisEvent.id next if i.id == thisEvent.id