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

Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases

Browse Source
This commit is contained in:
infinitefusion
2024-06-30 15:47:04 -04:00
parent 5e30a12118 ad1be384ce
commit e186c4b668
18 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/001_Settings.rb
View File

@@ -5,8 +5,8 @@
#==============================================================================#
module Settings
# The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
GAME_VERSION = '6.2.1'
GAME_VERSION_NUMBER = "6.2.1"
GAME_VERSION = '6.2.2'
GAME_VERSION_NUMBER = "6.2.2"
POKERADAR_LIGHT_ANIMATION_RED_ID = 17
POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18

2
Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb
View File

@@ -177,7 +177,7 @@ class PokeBattle_Scene
sprite.setBitmapDirectly(generate_front_trainer_sprite_bitmap())
sprite.zoom_x=2
sprite.zoom_y=2
sprite.z=30 + idxTrainer
sprite.z=100 + idxTrainer
sprite.mirror =true
@sprites["player_#{idxTrainer + 1}"] = sprite

6
Data/Scripts/013_Items/002_Item_Effects.rb
View File

@@ -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