From 19864599e039116032403e4212fd8d0926f059d9 Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Sun, 30 Jun 2024 15:45:03 -0400 Subject: [PATCH] removes the ability to fish while surfing --- Data/Scripts/013_Items/002_Item_Effects.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Data/Scripts/013_Items/002_Item_Effects.rb b/Data/Scripts/013_Items/002_Item_Effects.rb index a608f27c3..078a819bf 100644 --- a/Data/Scripts/013_Items/002_Item_Effects.rb +++ b/Data/Scripts/013_Items/002_Item_Effects.rb @@ -244,7 +244,7 @@ ItemHandlers::UseInField.copy(:BICYCLE, :RACEBIKE) ItemHandlers::UseInField.add(:OLDROD, proc { |item| notCliff = $game_map.passable?($game_player.x, $game_player.y, $game_player.direction, $game_player) - if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff) + if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff) || $PokemonGlobal.surfing pbMessage(_INTL("Can't use that here.")) next 0 end @@ -257,7 +257,7 @@ ItemHandlers::UseInField.add(:OLDROD, proc { |item| ItemHandlers::UseInField.add(:GOODROD, proc { |item| notCliff = $game_map.passable?($game_player.x, $game_player.y, $game_player.direction, $game_player) - if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff) + if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff) || $PokemonGlobal.surfing pbMessage(_INTL("Can't use that here.")) next 0 end @@ -270,7 +270,7 @@ ItemHandlers::UseInField.add(:GOODROD, proc { |item| ItemHandlers::UseInField.add(:SUPERROD, proc { |item| notCliff = $game_map.passable?($game_player.x, $game_player.y, $game_player.direction, $game_player) - if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff) + if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff) || $PokemonGlobal.surfing pbMessage(_INTL("Can't use that here.")) next 0 end