mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Fixed some bugs from recent commits
This commit is contained in:
@@ -207,7 +207,7 @@ class PokeBattle_Move
|
||||
c += 1 if user.inHyperMode? && @type == :SHADOW
|
||||
c = ratios.length-1 if c>=ratios.length
|
||||
# Calculation
|
||||
return true if ratio[c] == 1
|
||||
return true if ratios[c] == 1
|
||||
r = @battle.pbRandom(ratios[c])
|
||||
return true if r == 0
|
||||
if r == 1 && Settings::AFFECTION_EFFECTS && @battle.internalBattle &&
|
||||
|
||||
@@ -281,11 +281,11 @@ class DayCare
|
||||
def choice_text
|
||||
return nil if !filled?
|
||||
if @pokemon.male?
|
||||
return choices.push(_INTL("{1} (♂, Lv.{2})", @pokemon.name, @pokemon.level))
|
||||
return _INTL("{1} (♂, Lv.{2})", @pokemon.name, @pokemon.level)
|
||||
elsif @pokemon.female?
|
||||
return choices.push(_INTL("{1} (♀, Lv.{2})", @pokemon.name, @pokemon.level))
|
||||
return _INTL("{1} (♀, Lv.{2})", @pokemon.name, @pokemon.level)
|
||||
end
|
||||
return choices.push(_INTL("{1} (Lv.{2})", @pokemon.name, @pokemon.level))
|
||||
return _INTL("{1} (Lv.{2})", @pokemon.name, @pokemon.level)
|
||||
end
|
||||
|
||||
def add_exp(amount = 1)
|
||||
|
||||
@@ -453,6 +453,7 @@ class PokemonParty_Scene
|
||||
@can_access_storage = can_access_storage
|
||||
addBackgroundPlane(@sprites,"partybg","Party/bg",@viewport)
|
||||
@sprites["messagebox"] = Window_AdvancedTextPokemon.new("")
|
||||
@sprites["messagebox"].z = 50
|
||||
@sprites["messagebox"].viewport = @viewport
|
||||
@sprites["messagebox"].visible = false
|
||||
@sprites["messagebox"].letterbyletter = true
|
||||
@@ -461,6 +462,7 @@ class PokemonParty_Scene
|
||||
@can_access_storage ? _INTL("[Special]: To Boxes") : "")
|
||||
@sprites["storagetext"].x = 32
|
||||
@sprites["storagetext"].y = Graphics.height - @sprites["messagebox"].height - 16
|
||||
@sprites["storagetext"].z = 10
|
||||
@sprites["storagetext"].viewport = @viewport
|
||||
@sprites["storagetext"].baseColor = Color.new(248, 248, 248)
|
||||
@sprites["storagetext"].shadowColor = Color.new(0, 0, 0)
|
||||
|
||||
Reference in New Issue
Block a user