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

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

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

@@ -173,8 +173,7 @@ class Battle
newLevel = growth_rate.level_from_exp(expFinal)
if newLevel < curLevel
debugInfo = "Levels: #{curLevel}->#{newLevel} | Exp: #{pkmn.exp}->#{expFinal} | gain: #{expGained}"
raise _INTL("{1}'s new level is less than its\r\ncurrent level, which shouldn't happen.\r\n[Debug: {2}]",
pkmn.name, debugInfo)
raise _INTL("{1}'s new level is less than its current level, which shouldn't happen.", pkmn.name) + "\r\n[#{debugInfo}]"
end
# Give Exp
if pkmn.shadowPokemon?

2
Data/Scripts/011_Battle/004_Scene/001_Battle_Scene.rb
View File

@@ -234,7 +234,7 @@ class Battle::Scene
pbWaitMessage
pbShowWindow(MESSAGE_BOX)
cw = @sprites["messageWindow"]
cw.text = _INTL("{1}\1", msg)
cw.text = msg + "\1"
PBDebug.log(msg)
yielded = false
timer = 0.0

2
Data/Scripts/011_Battle/007_Other battle types/002_BugContestBattle.rb
View File

@@ -59,7 +59,7 @@ class BugContestBattle < Battle
if pbBugContestState.lastPokemon
lastPokemon = pbBugContestState.lastPokemon
pbDisplayPaused(_INTL("You already caught a {1}.", lastPokemon.name))
helptext = _INTL("STOCK POKéMON:\n {1} Lv.{2} MaxHP: {3}\nTHIS POKéMON:\n {4} Lv.{5} MaxHP: {6}",
helptext = _INTL("Stock Pokémon:\n{1} Lv.{2} Max HP: {3}\nThis Pokémon:\n{4} Lv.{5} Max HP: {6}",
lastPokemon.name, lastPokemon.level, lastPokemon.totalhp,
pkmn.name, pkmn.level, pkmn.totalhp)
@scene.pbShowHelp(helptext)

28
Data/Scripts/011_Battle/007_Other battle types/004_BattleArenaBattle.rb
View File

@@ -177,7 +177,7 @@ class BattleArenaBattle < Battle
ratings2.each { |val| points[1] += val }
# Make judgment
if points[0] == points[1]
pbDisplay(_INTL("{1} tied the opponent\n{2} in a referee's decision!",
pbDisplay(_INTL("{1} tied the opponent {2} in a referee's decision!",
@battlers[0].name, @battlers[1].name))
# NOTE: Pokémon doesn't really lose HP, but the effect is mostly the
# same.
@@ -186,12 +186,12 @@ class BattleArenaBattle < Battle
@battlers[1].hp = 0
@battlers[1].pbFaint(false)
elsif points[0] > points[1]
pbDisplay(_INTL("{1} defeated the opponent\n{2} in a referee's decision!",
pbDisplay(_INTL("{1} defeated the opponent {2} in a referee's decision!",
@battlers[0].name, @battlers[1].name))
@battlers[1].hp = 0
@battlers[1].pbFaint(false)
else
pbDisplay(_INTL("{1} lost to the opponent\n{2} in a referee's decision!",
pbDisplay(_INTL("{1} lost to the opponent {2} in a referee's decision!",
@battlers[0].name, @battlers[1].name))
@battlers[0].hp = 0
@battlers[0].pbFaint(false)
@@ -259,8 +259,8 @@ class Battle::Scene
end
def pbBattleArenaBattlers(battler1, battler2)
pbMessage(_INTL("REFEREE: {1} VS {2}!\nCommence battling!\\wtnp[20]",
battler1.name, battler2.name)) { pbBattleArenaUpdate }
pbMessage(_INTL("REFEREE: {1} VS {2}!\nCommence battling!",
battler1.name, battler2.name) + "\\wtnp[20]") { pbBattleArenaUpdate }
end
def pbBattleArenaJudgment(battler1, battler2, ratings1, ratings2)
@@ -271,7 +271,7 @@ class Battle::Scene
msgwindow = pbCreateMessageWindow
dimmingvp = Viewport.new(0, 0, Graphics.width, Graphics.height - msgwindow.height)
pbMessageDisplay(msgwindow,
_INTL("REFEREE: That's it! We will now go to judging to determine the winner!\\wtnp[20]")) do
_INTL("REFEREE: That's it! We will now go to judging to determine the winner!") + "\\wtnp[20]") do
pbBattleArenaUpdate
dimmingvp.update
end
@@ -299,21 +299,21 @@ class Battle::Scene
end
updateJudgment(infowindow, 1, battler1, battler2, ratings1, ratings2)
pbMessageDisplay(msgwindow,
_INTL("REFEREE: Judging category 1, Mind!\nThe Pokémon showing the most guts!\\wtnp[40]")) do
_INTL("REFEREE: Judging category 1, Mind!\nThe Pokémon showing the most guts!") + "\\wtnp[40]") do
pbBattleArenaUpdate
dimmingvp.update
infowindow.update
end
updateJudgment(infowindow, 2, battler1, battler2, ratings1, ratings2)
pbMessageDisplay(msgwindow,
_INTL("REFEREE: Judging category 2, Skill!\nThe Pokémon using moves the best!\\wtnp[40]")) do
_INTL("REFEREE: Judging category 2, Skill!\nThe Pokémon using moves the best!") + "\\wtnp[40]") do
pbBattleArenaUpdate
dimmingvp.update
infowindow.update
end
updateJudgment(infowindow, 3, battler1, battler2, ratings1, ratings2)
pbMessageDisplay(msgwindow,
_INTL("REFEREE: Judging category 3, Body!\nThe Pokémon with the most vitality!\\wtnp[40]")) do
_INTL("REFEREE: Judging category 3, Body!\nThe Pokémon with the most vitality!") + "\\wtnp[40]") do
pbBattleArenaUpdate
dimmingvp.update
infowindow.update
@@ -326,23 +326,23 @@ class Battle::Scene
end
if total1 == total2
pbMessageDisplay(msgwindow,
_INTL("REFEREE: Judgment: {1} to {2}!\nWe have a draw!\\wtnp[40]", total1, total2)) do
_INTL("REFEREE: Judgment: {1} to {2}!\nWe have a draw!", total1, total2) + "\\wtnp[40]") do
pbBattleArenaUpdate
dimmingvp.update
infowindow.update
end
elsif total1 > total2
pbMessageDisplay(msgwindow,
_INTL("REFEREE: Judgment: {1} to {2}!\nThe winner is {3}'s {4}!\\wtnp[40]",
total1, total2, @battle.pbGetOwnerName(battler1.index), battler1.name)) do
_INTL("REFEREE: Judgment: {1} to {2}!\nThe winner is {3}'s {4}!",
total1, total2, @battle.pbGetOwnerName(battler1.index), battler1.name) + "\\wtnp[40]") do
pbBattleArenaUpdate
dimmingvp.update
infowindow.update
end
else
pbMessageDisplay(msgwindow,
_INTL("REFEREE: Judgment: {1} to {2}!\nThe winner is {3}!\\wtnp[40]",
total1, total2, battler2.name)) do
_INTL("REFEREE: Judgment: {1} to {2}!\nThe winner is {3}!",
total1, total2, battler2.name) + "\\wtnp[40]") do
pbBattleArenaUpdate
dimmingvp.update
infowindow.update