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

Updated HM/expAll/Switch Messages. (#156)

Browse Source
This commit is contained in:
Nathan-MV
2022-01-19 20:10:56 +00:00
committed by GitHub
parent 1279f8137e
commit e9afefb210
4 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Battle/001_Battle/003_Battle_ExpAndMoveLearning.rb
View File

@@ -44,7 +44,7 @@ class Battle
eachInTeam(0, 0) do |pkmn, i|
next if !pkmn.able?
next if b.participants.include?(i) || expShare.include?(i)
pbDisplayPaused(_INTL("Your party Pokémon in waiting also got Exp. Points!")) if showMessage
pbDisplayPaused(_INTL("Your other Pokémon also gained Exp. Points!")) if showMessage
showMessage = false
pbGainEVsOne(i, b)
pbGainExpOne(i, b, numPartic, expShare, expAll, false)

2
Data/Scripts/011_Battle/001_Battle/005_Battle_ActionSwitching.rb
View File

@@ -167,7 +167,7 @@ class Battle
new_index = pbLastInTeam(idxBattler)
idxPartyForName = new_index if new_index >= 0 && new_index != idxPartyNew
end
if pbDisplayConfirm(_INTL("{1} is about to send in {2}. Will you switch your Pokémon?",
if pbDisplayConfirm(_INTL("{1} is about to send out {2}. Will you switch your Pokémon?",
opponent.full_name, enemyParty[idxPartyForName].name))
idxPlayerPartyNew = pbSwitchInBetween(0, false, true)
if idxPlayerPartyNew >= 0

39
Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb
View File

@@ -196,8 +196,7 @@ def pbCut
pbMessage(_INTL("This tree looks like it can be cut down."))
return false
end
pbMessage(_INTL("This tree looks like it can be cut down!\1"))
if pbConfirmMessage(_INTL("Would you like to cut it?"))
if pbConfirmMessage(_INTL("This tree looks like it can be cut down!\nWould you like to cut it?"))
$stats.cut_count += 1
speciesname = (movefinder) ? movefinder.name : $player.name
pbMessage(_INTL("{1} used {2}!", speciesname, GameData::Move.get(move).name))
@@ -211,7 +210,7 @@ HiddenMoveHandlers::CanUseMove.add(:CUT, proc { |move, pkmn, showmsg|
next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_CUT, showmsg)
facingEvent = $game_player.pbFacingEvent
if !facingEvent || !facingEvent.name[/cuttree/i]
pbMessage(_INTL("Can't use that here.")) if showmsg
pbMessage(_INTL("You can't use that here.")) if showmsg
next false
end
next true
@@ -256,7 +255,7 @@ end
HiddenMoveHandlers::CanUseMove.add(:DIG, proc { |move, pkmn, showmsg|
escape = ($PokemonGlobal.escapePoint rescue nil)
if !escape || escape == []
pbMessage(_INTL("Can't use that here.")) if showmsg
pbMessage(_INTL("You can't use that here.")) if showmsg
next false
end
if !$game_player.can_map_transfer_with_follower?
@@ -413,16 +412,16 @@ HiddenMoveHandlers::CanUseMove.add(:DIVE, proc { |move, pkmn, showmsg|
end
if !surface_map_id ||
!$map_factory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_dive
pbMessage(_INTL("Can't use that here.")) if showmsg
pbMessage(_INTL("You can't use that here.")) if showmsg
next false
end
else
if !$game_map.metadata&.dive_map_id
pbMessage(_INTL("Can't use that here.")) if showmsg
pbMessage(_INTL("You can't use that here.")) if showmsg
next false
end
if !$game_player.terrain_tag.can_dive
pbMessage(_INTL("Can't use that here.")) if showmsg
pbMessage(_INTL("You can't use that here.")) if showmsg
next false
end
end
@@ -468,7 +467,7 @@ HiddenMoveHandlers::UseMove.add(:DIVE, proc { |move, pokemon|
HiddenMoveHandlers::CanUseMove.add(:FLASH, proc { |move, pkmn, showmsg|
next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_FLASH, showmsg)
if !$game_map.metadata&.dark_map
pbMessage(_INTL("Can't use that here.")) if showmsg
pbMessage(_INTL("You can't use that here.")) if showmsg
next false
end
if $PokemonGlobal.flashUsed
@@ -510,7 +509,7 @@ def pbCanFly?(pkmn = nil, show_messages = false)
return false
end
if !$game_map.metadata&.outdoor_map
pbMessage(_INTL("Can't use that here.")) if show_messages
pbMessage(_INTL("You can't use that here.")) if show_messages
return false
end
return true
@@ -552,7 +551,7 @@ HiddenMoveHandlers::CanUseMove.add(:FLY, proc { |move, pkmn, showmsg|
HiddenMoveHandlers::UseMove.add(:FLY, proc { |move, pkmn|
if $game_temp.fly_destination.nil?
pbMessage(_INTL("Can't use that here."))
pbMessage(_INTL("You can't use that here."))
next false
end
pbFlyToNewLocation(pkmn)
@@ -610,7 +609,7 @@ end
HiddenMoveHandlers::CanUseMove.add(:HEADBUTT, proc { |move, pkmn, showmsg|
facingEvent = $game_player.pbFacingEvent
if !facingEvent || !facingEvent.name[/headbutttree/i]
pbMessage(_INTL("Can't use that here.")) if showmsg
pbMessage(_INTL("You can't use that here.")) if showmsg
next false
end
next true
@@ -644,7 +643,7 @@ def pbRockSmash
pbMessage(_INTL("It's a rugged rock, but a Pokémon may be able to smash it."))
return false
end
if pbConfirmMessage(_INTL("This rock appears to be breakable. Would you like to use Rock Smash?"))
if pbConfirmMessage(_INTL("This rock seems breakable with a hidden move.\nWould you like to use Rock Smash?"))
$stats.rock_smash_count += 1
speciesname = (movefinder) ? movefinder.name : $player.name
pbMessage(_INTL("{1} used {2}!", speciesname, GameData::Move.get(move).name))
@@ -658,7 +657,7 @@ HiddenMoveHandlers::CanUseMove.add(:ROCKSMASH, proc { |move, pkmn, showmsg|
next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_ROCKSMASH, showmsg)
facingEvent = $game_player.pbFacingEvent
if !facingEvent || !facingEvent.name[/smashrock/i]
pbMessage(_INTL("Can't use that here.")) if showmsg
pbMessage(_INTL("You can't use that here.")) if showmsg
next false
end
next true
@@ -693,12 +692,12 @@ def pbStrength
pbMessage(_INTL("It's a big boulder, but a Pokémon may be able to push it aside."))
return false
end
pbMessage(_INTL("It's a big boulder, but a Pokémon may be able to push it aside.\1"))
pbMessage(_INTL("It's a big boulder, but you may be able to push it aside with a hidden move.\1"))
if pbConfirmMessage(_INTL("Would you like to use Strength?"))
speciesname = (movefinder) ? movefinder.name : $player.name
pbMessage(_INTL("{1} used {2}!", speciesname, GameData::Move.get(move).name))
pbHiddenMoveAnimation(movefinder)
pbMessage(_INTL("{1}'s Strength made it possible to move boulders around!", speciesname))
pbMessage(_INTL("Strength made it possible to move boulders around!"))
$PokemonMap.strengthUsed = true
return true
end
@@ -725,7 +724,7 @@ HiddenMoveHandlers::UseMove.add(:STRENGTH, proc { |move, pokemon|
if !pbHiddenMoveAnimation(pokemon)
pbMessage(_INTL("{1} used {2}!\1", pokemon.name, GameData::Move.get(move).name))
end
pbMessage(_INTL("{1}'s Strength made it possible to move boulders around!", pokemon.name))
pbMessage(_INTL("Strength made it possible to move boulders around!"))
$PokemonMap.strengthUsed = true
next true
})
@@ -743,7 +742,7 @@ def pbSurf
if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_SURF, false) || (!$DEBUG && !movefinder)
return false
end
if pbConfirmMessage(_INTL("The water is a deep blue...\nWould you like to surf on it?"))
if pbConfirmMessage(_INTL("The water is a deep blue color... Would you like to use Surf on it?"))
speciesname = (movefinder) ? movefinder.name : $player.name
pbMessage(_INTL("{1} used {2}!", speciesname, GameData::Move.get(move).name))
pbCancelVehicles
@@ -902,14 +901,14 @@ HiddenMoveHandlers::UseMove.add(:SWEETSCENT, proc { |move, pokemon|
#===============================================================================
HiddenMoveHandlers::CanUseMove.add(:TELEPORT, proc { |move, pkmn, showmsg|
if !$game_map.metadata&.outdoor_map
pbMessage(_INTL("Can't use that here.")) if showmsg
pbMessage(_INTL("You can't use that here.")) if showmsg
next false
end
healing = $PokemonGlobal.healingSpot
healing = GameData::PlayerMetadata.get($player.character_ID)&.home if !healing
healing = GameData::Metadata.get.home if !healing # Home
if !healing
pbMessage(_INTL("Can't use that here.")) if showmsg
pbMessage(_INTL("You can't use that here.")) if showmsg
next false
end
if !$game_player.can_map_transfer_with_follower?
@@ -1021,7 +1020,7 @@ EventHandlers.add(:on_player_interact, :waterfall,
HiddenMoveHandlers::CanUseMove.add(:WATERFALL, proc { |move, pkmn, showmsg|
next false if !pbCheckHiddenMoveBadge(Settings::BADGE_FOR_WATERFALL, showmsg)
if !$game_player.pbFacingTerrainTag.waterfall
pbMessage(_INTL("Can't use that here.")) if showmsg
pbMessage(_INTL("You can't use that here.")) if showmsg
next false
end
next true

2
Data/Scripts/016_UI/009_UI_RegionMap.rb
View File

@@ -314,7 +314,7 @@ class PokemonRegionMap_Scene
($DEBUG && Input.press?(Input::CTRL)))
return healspot if @fly_map
name = pbGetMapNameFromId(healspot[0])
return healspot if pbConfirmMessage(_INTL("Would you like to fly to {1}?", name)) { pbUpdate }
return healspot if pbConfirmMessage(_INTL("Would you like to use Fly to go to {1}?", name)) { pbUpdate }
end
elsif Input.trigger?(Input::USE) && @editor # Intentionally after other USE input check
pbChangeMapLocation(@map_x, @map_y)