mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 21:24:59 +00:00
Removed redundant "\r" from various messages, removed usages of BitmapWrapper, fixed Lure Ball error in battles started in the Debug menu, improved Terrain Tag editor, fixed some Compiler errors, enabled vsync, fixed event graphics frozen to the screen when using $game_player.moveto directly.
This commit is contained in:
@@ -262,21 +262,21 @@ module Battle::DebugMixin
|
||||
return ret if battler.nil?
|
||||
# Battler index, name
|
||||
ret += sprintf("[%d] %s", battler.index, battler.pbThis)
|
||||
ret += "\r\n"
|
||||
ret += "\n"
|
||||
# Species
|
||||
ret += _INTL("Species: {1}", GameData::Species.get(battler.species).name)
|
||||
ret += "\r\n"
|
||||
ret += "\n"
|
||||
# Form number
|
||||
ret += _INTL("Form: {1}", battler.form)
|
||||
ret += "\r\n"
|
||||
ret += "\n"
|
||||
# Level, gender, shininess
|
||||
ret += _INTL("Level {1}, {2}", battler.level,
|
||||
(battler.pokemon.male?) ? "♂" : (battler.pokemon.female?) ? "♀" : _INTL("genderless"))
|
||||
ret += ", " + _INTL("shiny") if battler.pokemon.shiny?
|
||||
ret += "\r\n"
|
||||
ret += "\n"
|
||||
# HP
|
||||
ret += _INTL("HP: {1}/{2} ({3}%)", battler.hp, battler.totalhp, (100.0 * battler.hp / battler.totalhp).to_i)
|
||||
ret += "\r\n"
|
||||
ret += "\n"
|
||||
# Status
|
||||
ret += _INTL("Status: {1}", GameData::Status.get(battler.status).name)
|
||||
case battler.status
|
||||
@@ -287,7 +287,7 @@ module Battle::DebugMixin
|
||||
ret += " " + _INTL("(toxic, {1}/16)", battler.effects[PBEffects::Toxic])
|
||||
end
|
||||
end
|
||||
ret += "\r\n"
|
||||
ret += "\n"
|
||||
# Stat stages
|
||||
stages = []
|
||||
GameData::Stat.each_battle do |stat|
|
||||
@@ -299,10 +299,10 @@ module Battle::DebugMixin
|
||||
stages.push(stage_text)
|
||||
end
|
||||
ret += _INTL("Stat stages: {1}", (stages.empty?) ? "-" : stages.join(", "))
|
||||
ret += "\r\n"
|
||||
ret += "\n"
|
||||
# Ability
|
||||
ret += _INTL("Ability: {1}", (battler.ability) ? battler.abilityName : "-")
|
||||
ret += "\r\n"
|
||||
ret += "\n"
|
||||
# Held item
|
||||
ret += _INTL("Item: {1}", (battler.item) ? battler.itemName : "-")
|
||||
return ret
|
||||
@@ -314,18 +314,18 @@ module Battle::DebugMixin
|
||||
sp_data = pkmn.species_data
|
||||
# Name, species
|
||||
ret += sprintf("%s (%s)", pkmn.name, sp_data.name)
|
||||
ret += "\r\n"
|
||||
ret += "\n"
|
||||
# Form number
|
||||
ret += _INTL("Form: {1}", sp_data.form)
|
||||
ret += "\r\n"
|
||||
ret += "\n"
|
||||
# Level, gender, shininess
|
||||
ret += _INTL("Level {1}, {2}", pkmn.level,
|
||||
(pkmn.male?) ? "♂" : (pkmn.female?) ? "♀" : _INTL("genderless"))
|
||||
ret += ", " + _INTL("shiny") if pkmn.shiny?
|
||||
ret += "\r\n"
|
||||
ret += "\n"
|
||||
# HP
|
||||
ret += _INTL("HP: {1}/{2} ({3}%)", pkmn.hp, pkmn.totalhp, (100.0 * pkmn.hp / pkmn.totalhp).to_i)
|
||||
ret += "\r\n"
|
||||
ret += "\n"
|
||||
# Status
|
||||
ret += _INTL("Status: {1}", GameData::Status.get(pkmn.status).name)
|
||||
case pkmn.status
|
||||
@@ -334,10 +334,10 @@ module Battle::DebugMixin
|
||||
when :POISON
|
||||
ret += " " + _INTL("(toxic)") if pkmn.statusCount > 0
|
||||
end
|
||||
ret += "\r\n"
|
||||
ret += "\n"
|
||||
# Ability
|
||||
ret += _INTL("Ability: {1}", pkmn.ability&.name || "-")
|
||||
ret += "\r\n"
|
||||
ret += "\n"
|
||||
# Held item
|
||||
ret += _INTL("Item: {1}", pkmn.item&.name || "-")
|
||||
return ret
|
||||
|
||||
@@ -252,10 +252,10 @@ MenuHandlers.add(:battle_debug_menu, :weather, {
|
||||
msg = _INTL("Current weather: {1}", weather_data.name || _INTL("Unknown"))
|
||||
if weather_data.id != :None
|
||||
if battle.field.weatherDuration > 0
|
||||
msg += "\r\n"
|
||||
msg += "\n"
|
||||
msg += _INTL("Duration : {1} more round(s)", battle.field.weatherDuration)
|
||||
elsif battle.field.weatherDuration < 0
|
||||
msg += "\r\n"
|
||||
msg += "\n"
|
||||
msg += _INTL("Duration : Infinite")
|
||||
end
|
||||
end
|
||||
@@ -314,10 +314,10 @@ MenuHandlers.add(:battle_debug_menu, :terrain, {
|
||||
msg = _INTL("Current terrain: {1}", terrain_data.name || _INTL("Unknown"))
|
||||
if terrain_data.id != :None
|
||||
if battle.field.terrainDuration > 0
|
||||
msg += "\r\n"
|
||||
msg += "\n"
|
||||
msg += _INTL("Duration : {1} more round(s)", battle.field.terrainDuration)
|
||||
elsif battle.field.terrainDuration < 0
|
||||
msg += "\r\n"
|
||||
msg += "\n"
|
||||
msg += _INTL("Duration : Infinite")
|
||||
end
|
||||
end
|
||||
@@ -373,7 +373,7 @@ MenuHandlers.add(:battle_debug_menu, :environment_time, {
|
||||
loop do
|
||||
environment_data = GameData::Environment.try_get(battle.environment)
|
||||
msg = _INTL("Environment: {1}", environment_data.name || _INTL("Unknown"))
|
||||
msg += "\r\n"
|
||||
msg += "\n"
|
||||
msg += _INTL("Time of day: {1}", [_INTL("Day"), _INTL("Evening"), _INTL("Night")][battle.time])
|
||||
cmd = pbMessage("\\ts[]" + msg, [_INTL("Change environment"),
|
||||
_INTL("Change time of day")], -1, nil, cmd)
|
||||
|
||||
@@ -431,7 +431,7 @@ MenuHandlers.add(:battle_pokemon_debug_menu, :set_types, {
|
||||
commands.push(_INTL("Extra type: {1}", extra_type_name))
|
||||
types.push(extra_type)
|
||||
msg = _INTL("Effective types: {1}", battler.pbTypes(true).map { |t| GameData::Type.get(t).name }.join("/"))
|
||||
msg += "\r\n" + _INTL("(Change a type to itself to remove it.)")
|
||||
msg += "\n" + _INTL("(Change a type to itself to remove it.)")
|
||||
cmd = pbMessage("\\ts[]" + msg, commands, -1, nil, cmd)
|
||||
break if cmd < 0
|
||||
old_type = types[cmd]
|
||||
|
||||
Reference in New Issue
Block a user