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

Added message saving back to compiler, tweaked various messages, fixed typo of constant, fixed missing attr_reader

Browse Source
This commit is contained in:
Maruno17
2023-04-15 20:29:47 +01:00
parent af5256ae0f
commit b9bf3e8b83
30 changed files with 135 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb
View File

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

6
Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb
View File

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

10
Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb
View File

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

14
Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb
View File

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

6
Data/Scripts/016_UI/005_UI_Party.rb
View File

@@ -1454,16 +1454,16 @@ MenuHandlers.add(:party_menu_item, :move, {
newitem = newpkmn.item
newitemname = newitem.portion_name
if newitemname.starts_with_vowel?
screen.pbDisplay(_INTL("{1} is already holding an {2}.\1", newpkmn.name, newitemname))
screen.pbDisplay(_INTL("{1} is already holding an {2}.", newpkmn.name, newitemname) + "\1")
else
screen.pbDisplay(_INTL("{1} is already holding a {2}.\1", newpkmn.name, newitemname))
screen.pbDisplay(_INTL("{1} is already holding a {2}.", newpkmn.name, newitemname) + "\1")
end
next if !screen.pbConfirm(_INTL("Would you like to switch the two items?"))
newpkmn.item = item
pkmn.item = newitem
screen.scene.pbClearSwitching
screen.pbRefresh
screen.pbDisplay(_INTL("{1} was given the {2} to hold.", newpkmn.name, portionitemname))
screen.pbDisplay(_INTL("{1} was given the {2} to hold.", newpkmn.name, portionitemname) + "\1")
screen.pbDisplay(_INTL("{1} was given the {2} to hold.", pkmn.name, newitemname))
moved = true
break

6
Data/Scripts/016_UI/013_UI_Load.rb
View File

@@ -240,7 +240,7 @@ class PokemonLoadScreen
# Called if all save data is invalid.
# Prompts the player to delete the save files.
def prompt_save_deletion
pbMessage(_INTL("The save file is corrupt, or is incompatible with this game."))
pbMessage(_INTL("The save file is corrupt, or is incompatible with this game.") + "\1")
exit unless pbConfirmMessageSerious(
_INTL("Do you want to delete the save file and start anew?")
)
@@ -254,9 +254,9 @@ class PokemonLoadScreen
@scene.pbStartScene2
if SaveData.exists?
if pbConfirmMessageSerious(_INTL("Delete all saved data?"))
pbMessage(_INTL("Once data has been deleted, there is no way to recover it.\1"))
pbMessage(_INTL("Once data has been deleted, there is no way to recover it.") + "\1")
if pbConfirmMessageSerious(_INTL("Delete the saved data anyway?"))
pbMessage(_INTL("Deleting all data. Don't turn off the power.\\wtnp[0]"))
pbMessage(_INTL("Deleting all data. Don't turn off the power.") + "\\wtnp[0]")
self.delete_save_data
end
end

14
Data/Scripts/016_UI/014_UI_Save.rb
View File

@@ -15,8 +15,8 @@ def pbEmergencySave
end
end
if Game.save
pbMessage("\\se[]" +
_INTL("The game was saved.\\me[GUI save game] The previous save file has been backed up.\\wtnp[30]"))
pbMessage("\\se[]" + _INTL("The game was saved.") + "\\me[GUI save game]\\wtnp[30]")
pbMessage("\\se[]" + _INTL("The previous save file has been backed up.") + "\\wtnp[30]")
else
pbMessage("\\se[]" + _INTL("Save failed.\\wtnp[30]"))
end
@@ -102,9 +102,9 @@ class PokemonSaveScreen
@scene.pbStartScreen
if pbConfirmMessage(_INTL("Would you like to save the game?"))
if SaveData.exists? && $game_temp.begun_new_game
pbMessage(_INTL("WARNING!"))
pbMessage(_INTL("There is a different game file that is already saved."))
pbMessage(_INTL("If you save now, the other file's adventure, including items and Pokémon, will be entirely lost."))
pbMessage(_INTL("WARNING!") + "\1")
pbMessage(_INTL("There is a different game file that is already saved.") + "\1")
pbMessage(_INTL("If you save now, the other file's adventure, including items and Pokémon, will be entirely lost.") + "\1")
if !pbConfirmMessageSerious(_INTL("Are you sure you want to save now and overwrite the other save file?"))
pbSEPlay("GUI save choice")
@scene.pbEndScreen
@@ -114,10 +114,10 @@ class PokemonSaveScreen
$game_temp.begun_new_game = false
pbSEPlay("GUI save choice")
if Game.save
pbMessage("\\se[]" + _INTL("{1} saved the game.\\me[GUI save game]\\wtnp[30]", $player.name))
pbMessage("\\se[]" + _INTL("{1} saved the game.", $player.name) + "\\me[GUI save game]\\wtnp[30]")
ret = true
else
pbMessage("\\se[]" + _INTL("Save failed.\\wtnp[30]"))
pbMessage("\\se[]" + _INTL("Save failed.") + "\\wtnp[30]")
ret = false
end
else

8
Data/Scripts/016_UI/019_UI_PC.rb
View File

@@ -108,7 +108,7 @@ end
#
#===============================================================================
def pbTrainerPC
pbMessage(_INTL("\\se[PC open]{1} booted up the PC.", $player.name))
pbMessage("\\se[PC open]" + _INTL("{1} booted up the PC.", $player.name))
pbTrainerPCMenu
pbSEPlay("PC close")
end
@@ -132,7 +132,7 @@ end
#
#===============================================================================
def pbPokeCenterPC
pbMessage(_INTL("\\se[PC open]{1} booted up the PC.", $player.name))
pbMessage("\\se[PC open]" + _INTL("{1} booted up the PC.", $player.name))
# Get all commands
command_list = []
commands = []
@@ -166,7 +166,7 @@ MenuHandlers.add(:pc_menu, :pokemon_storage, {
},
"order" => 10,
"effect" => proc { |menu|
pbMessage(_INTL("\\se[PC access]The Pokémon Storage System was opened."))
pbMessage("\\se[PC access]" + _INTL("The Pokémon Storage System was opened."))
command = 0
loop do
command = pbShowCommandsWithHelp(nil,
@@ -222,7 +222,7 @@ MenuHandlers.add(:pc_menu, :player_pc, {
"name" => proc { next _INTL("{1}'s PC", $player.name) },
"order" => 20,
"effect" => proc { |menu|
pbMessage(_INTL("\\se[PC access]Accessed {1}'s PC.", $player.name))
pbMessage("\\se[PC access]" + _INTL("Accessed {1}'s PC.", $player.name))
pbTrainerPCMenu
next false
}

4
Data/Scripts/016_UI/023_UI_PurifyChamber.rb
View File

@@ -531,7 +531,7 @@ class PurifyChamberScreen
end
end
if pbCheckPurify
@scene.pbDisplay(_INTL("There is a Pokémon that is ready to open its heart!\1"))
@scene.pbDisplay(_INTL("There is a Pokémon that is ready to open its heart!") + "\1")
@scene.pbCloseSetDetail
pbDoPurify
return false
@@ -579,7 +579,7 @@ class PurifyChamberScreen
pbStorePokemon(@chamber[set].shadow)
@chamber.setShadow(set, nil) # Remove shadow Pokemon from set
if (i + 1) != purifiables.length
@scene.pbDisplay(_INTL("There is another Pokémon that is ready to open its heart!"))
@scene.pbDisplay(_INTL("There is another Pokémon that is ready to open its heart!") + "\1")
if !@scene.pbConfirm(_INTL("Would you like to switch sets?"))
@scene.pbCloseSet
break

16
Data/Scripts/016_UI/024_UI_MysteryGift.rb
View File

@@ -245,7 +245,7 @@ def pbDownloadMysteryGift(trainer)
addBackgroundPlane(sprites, "background", "mysterygift_bg", viewport)
pbFadeInAndShow(sprites)
sprites["msgwindow"] = pbCreateMessageWindow
pbMessageDisplay(sprites["msgwindow"], _INTL("Searching for a gift.\nPlease wait...\\wtnp[0]"))
pbMessageDisplay(sprites["msgwindow"], _INTL("Searching for a gift.\nPlease wait...") + "\\wtnp[0]")
string = pbDownloadToString(MysteryGift::URL)
if nil_or_empty?(string)
pbMessageDisplay(sprites["msgwindow"], _INTL("No new gifts are available."))
@@ -268,7 +268,7 @@ def pbDownloadMysteryGift(trainer)
commands.push(gift[3])
end
commands.push(_INTL("Cancel"))
pbMessageDisplay(sprites["msgwindow"], _INTL("Choose the gift you want to receive.\\wtnp[0]"))
pbMessageDisplay(sprites["msgwindow"], _INTL("Choose the gift you want to receive.") + "\\wtnp[0]")
command = pbShowCommands(sprites["msgwindow"], commands, -1)
if command == -1 || command == commands.length - 1
break
@@ -302,7 +302,7 @@ def pbDownloadMysteryGift(trainer)
pbUpdateSceneMap
end
sprites["msgwindow"].visible = true
pbMessageDisplay(sprites["msgwindow"], _INTL("The gift has been received!")) { sprite.update }
pbMessageDisplay(sprites["msgwindow"], _INTL("The gift has been received!") + "\1") { sprite.update }
pbMessageDisplay(sprites["msgwindow"], _INTL("Please pick up your gift from the deliveryman in any Poké Mart.")) { sprite.update }
trainer.mystery_gifts.push(gift)
pending.delete_at(command)
@@ -408,14 +408,14 @@ def pbReceiveMysteryGift(id)
itm = GameData::Item.get(item)
itemname = (qty > 1) ? itm.portion_name_plural : itm.portion_name
if itm.is_machine? # TM or HM
pbMessage(_INTL("\\me[Item get]You obtained \\c[1]{1} {2}\\c[0]!\\wtnp[30]", itemname,
GameData::Move.get(itm.move).name))
pbMessage("\\me[Item get]" + _INTL("You obtained \\c[1]{1} {2}\\c[0]!", itemname,
GameData::Move.get(itm.move).name) + "\\wtnp[30]")
elsif qty > 1
pbMessage(_INTL("\\me[Item get]You obtained {1} \\c[1]{2}\\c[0]!\\wtnp[30]", qty, itemname))
pbMessage("\\me[Item get]" + _INTL("You obtained {1} \\c[1]{2}\\c[0]!", qty, itemname) + "\\wtnp[30]")
elsif itemname.starts_with_vowel?
pbMessage(_INTL("\\me[Item get]You obtained an \\c[1]{1}\\c[0]!\\wtnp[30]", itemname))
pbMessage("\\me[Item get]" + _INTL("You obtained an \\c[1]{1}\\c[0]!", itemname) + "\\wtnp[30]")
else
pbMessage(_INTL("\\me[Item get]You obtained a \\c[1]{1}\\c[0]!\\wtnp[30]", itemname))
pbMessage("\\me[Item get]" + _INTL("You obtained a \\c[1]{1}\\c[0]!", itemname) + "\\wtnp[30]")
end
$player.mystery_gifts[index] = [id]
return true