mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 21:24:59 +00:00
Added message saving back to compiler, tweaked various messages, fixed typo of constant, fixed missing attr_reader
This commit is contained in:
@@ -99,7 +99,7 @@ class PokemonEggHatch_Scene
|
||||
pbBGMStop
|
||||
pbMEPlay("Evolution success")
|
||||
@pokemon.name = nil
|
||||
pbMessage("\\se[]" + _INTL("{1} hatched from the Egg!\\wt[80]", @pokemon.name)) { update }
|
||||
pbMessage("\\se[]" + _INTL("{1} hatched from the Egg!", @pokemon.name) + "\\wt[80]") { update }
|
||||
# Record the Pokémon's species as owned in the Pokédex
|
||||
was_owned = $player.owned?(@pokemon.species)
|
||||
$player.pokedex.register(@pokemon)
|
||||
@@ -194,7 +194,7 @@ end
|
||||
#
|
||||
#===============================================================================
|
||||
def pbHatchAnimation(pokemon)
|
||||
pbMessage(_INTL("Huh?\1"))
|
||||
pbMessage(_INTL("Huh?") + "\1")
|
||||
pbFadeOutInWithMusic do
|
||||
scene = PokemonEggHatch_Scene.new
|
||||
screen = PokemonEggHatchScreen.new(scene)
|
||||
@@ -214,9 +214,9 @@ def pbHatch(pokemon)
|
||||
pokemon.hatched_map = $game_map.map_id
|
||||
pokemon.record_first_moves
|
||||
if !pbHatchAnimation(pokemon)
|
||||
pbMessage(_INTL("Huh?\1"))
|
||||
pbMessage(_INTL("...\1"))
|
||||
pbMessage(_INTL("... .... .....\1"))
|
||||
pbMessage(_INTL("Huh?") + "\1")
|
||||
pbMessage(_INTL("...") + "\1")
|
||||
pbMessage(_INTL("... .... .....") + "\1")
|
||||
pbMessage(_INTL("{1} hatched from the Egg!", speciesname))
|
||||
was_owned = $player.owned?(pokemon.species)
|
||||
$player.pokedex.register(pokemon)
|
||||
|
||||
@@ -535,7 +535,7 @@ class PokemonEvolutionScene
|
||||
metaplayer1.play
|
||||
metaplayer2.play
|
||||
pbBGMStop
|
||||
pbMessageDisplay(@sprites["msgwindow"], "\\se[]" + _INTL("What?") + "\\1") { pbUpdate }
|
||||
pbMessageDisplay(@sprites["msgwindow"], "\\se[]" + _INTL("What?") + "\1") { pbUpdate }
|
||||
pbPlayDecisionSE
|
||||
@pokemon.play_cry
|
||||
@sprites["msgwindow"].text = _INTL("{1} is evolving!", @pokemon.name)
|
||||
@@ -591,8 +591,8 @@ class PokemonEvolutionScene
|
||||
pbMEPlay("Evolution success")
|
||||
newspeciesname = GameData::Species.get(@newspecies).name
|
||||
pbMessageDisplay(@sprites["msgwindow"],
|
||||
"\\se[]" + _INTL("Congratulations! Your {1} evolved into {2}!\\wt[80]",
|
||||
@pokemon.name, newspeciesname)) { pbUpdate }
|
||||
"\\se[]" + _INTL("Congratulations! Your {1} evolved into {2}!",
|
||||
@pokemon.name, newspeciesname) + "\\wt[80]") { pbUpdate }
|
||||
@sprites["msgwindow"].text = ""
|
||||
# Check for consumed item and check if Pokémon should be duplicated
|
||||
pbEvolutionMethodAfterEvolution
|
||||
|
||||
@@ -175,19 +175,19 @@ class PokemonTrade_Scene
|
||||
speciesname1 = GameData::Species.get(@pokemon.species).name
|
||||
speciesname2 = GameData::Species.get(@pokemon2.species).name
|
||||
pbMessageDisplay(@sprites["msgwindow"],
|
||||
_ISPRINTF("{1:s}\r\nID: {2:05d} OT: {3:s}\\wtnp[0]",
|
||||
@pokemon.name, @pokemon.owner.public_id, @pokemon.owner.name)) { pbUpdate }
|
||||
_ISPRINTF("{1:s}\r\nID: {2:05d} OT: {3:s}",
|
||||
@pokemon.name, @pokemon.owner.public_id, @pokemon.owner.name) + "\\wtnp[0]") { pbUpdate }
|
||||
pbMessageWaitForInput(@sprites["msgwindow"], 50, true) { pbUpdate }
|
||||
pbPlayDecisionSE
|
||||
pbScene1
|
||||
pbMessageDisplay(@sprites["msgwindow"],
|
||||
_INTL("For {1}'s {2},\r\n{3} sends {4}.\1", @trader1, speciesname1, @trader2, speciesname2)) { pbUpdate }
|
||||
_INTL("For {1}'s {2},\r\n{3} sends {4}.", @trader1, speciesname1, @trader2, speciesname2) + "\1") { pbUpdate }
|
||||
pbMessageDisplay(@sprites["msgwindow"],
|
||||
_INTL("{1} bids farewell to {2}.", @trader2, speciesname2)) { pbUpdate }
|
||||
pbScene2
|
||||
pbMessageDisplay(@sprites["msgwindow"],
|
||||
_ISPRINTF("{1:s}\r\nID: {2:05d} OT: {3:s}\1",
|
||||
@pokemon2.name, @pokemon2.owner.public_id, @pokemon2.owner.name)) { pbUpdate }
|
||||
_ISPRINTF("{1:s}\r\nID: {2:05d} OT: {3:s}",
|
||||
@pokemon2.name, @pokemon2.owner.public_id, @pokemon2.owner.name) + "\1") { pbUpdate }
|
||||
pbMessageDisplay(@sprites["msgwindow"],
|
||||
_INTL("Take good care of {1}.", speciesname2)) { pbUpdate }
|
||||
# Show Pokédex entry for new species if it hasn't been owned before
|
||||
|
||||
@@ -283,21 +283,21 @@ class HallOfFame_Scene
|
||||
hour = totalsec / 60 / 60
|
||||
min = totalsec / 60 % 60
|
||||
pubid = sprintf("%05d", $player.public_ID)
|
||||
lefttext = _INTL("Name<r>{1}<br>", $player.name)
|
||||
lefttext += _INTL("ID No.<r>{1}<br>", pubid)
|
||||
lefttext = _INTL("Name<r>{1}", $player.name) + "<br>"
|
||||
lefttext += _INTL("ID No.<r>{1}", pubid) + "<br>"
|
||||
if hour > 0
|
||||
lefttext += _INTL("Time<r>{1}h {2}m<br>", hour, min)
|
||||
lefttext += _INTL("Time<r>{1}h {2}m", hour, min) + "<br>"
|
||||
else
|
||||
lefttext += _INTL("Time<r>{1}m<br>", min)
|
||||
lefttext += _INTL("Time<r>{1}m", min) + "<br>"
|
||||
end
|
||||
lefttext += _INTL("Pokédex<r>{1}/{2}<br>",
|
||||
$player.pokedex.owned_count, $player.pokedex.seen_count)
|
||||
lefttext += _INTL("Pokédex<r>{1}/{2}",
|
||||
$player.pokedex.owned_count, $player.pokedex.seen_count) + "<br>"
|
||||
@sprites["messagebox"] = Window_AdvancedTextPokemon.new(lefttext)
|
||||
@sprites["messagebox"].viewport = @viewport
|
||||
@sprites["messagebox"].width = 192 if @sprites["messagebox"].width < 192
|
||||
@sprites["msgwindow"] = pbCreateMessageWindow(@viewport)
|
||||
pbMessageDisplay(@sprites["msgwindow"],
|
||||
_INTL("League champion!\nCongratulations!\\^"))
|
||||
_INTL("League champion!\nCongratulations!") + "\\^")
|
||||
end
|
||||
|
||||
def writePokemonData(pokemon, hallNumber = -1)
|
||||
|
||||
Reference in New Issue
Block a user