mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
minor randomizer fixes + infinite dna reverse from pc
This commit is contained in:
@@ -1803,7 +1803,7 @@ class PokeBattle_Move_05E < PokeBattle_Move
|
||||
def pbEffectGeneral(user)
|
||||
newType = @newTypes[@battle.pbRandom(@newTypes.length)]
|
||||
user.pbChangeTypes(newType)
|
||||
typeName = GameData::Item.get(newType).name
|
||||
typeName = GameData::Type.get(newType).name
|
||||
@battle.pbDisplay(_INTL("{1} transformed into the {2} type!",user.pbThis,typeName))
|
||||
end
|
||||
end
|
||||
|
||||
@@ -421,12 +421,12 @@ class PokemonSummary_Scene
|
||||
# break
|
||||
# end
|
||||
# end
|
||||
if dexnum <= 0
|
||||
textpos.push(["???", 435, 74, 2, dexNumBase, dexNumShadow])
|
||||
else
|
||||
dexnum -= 1 if dexnumshift
|
||||
textpos.push([sprintf("%03d", dexnum), 435, 74, 2, dexNumBase, dexNumShadow])
|
||||
end
|
||||
# if dexnum <= 0
|
||||
# textpos.push(["???", 435, 74, 2, dexNumBase, dexNumShadow])
|
||||
# else
|
||||
# dexnum -= 1 if dexnumshift
|
||||
# textpos.push([sprintf("%03d", dexnum), 435, 74, 2, dexNumBase, dexNumShadow])
|
||||
# end
|
||||
# Write Original Trainer's name and ID number
|
||||
if @pokemon.owner.name.empty?
|
||||
textpos.push([_INTL("RENTAL"), 435, 170, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)])
|
||||
|
||||
@@ -1660,7 +1660,7 @@ class PokemonStorageScreen
|
||||
if pokemon != nil
|
||||
if dexNum(pokemon.species) > NB_POKEMON
|
||||
commands[cmdUnfuse = commands.length] = _INTL("Unfuse")
|
||||
commands[cmdReverse = commands.length] = _INTL("Reverse") if $PokemonBag.pbQuantity(:DNAREVERSER) > 0
|
||||
commands[cmdReverse = commands.length] = _INTL("Reverse") if $PokemonBag.pbQuantity(:DNAREVERSER) > 0 || $PokemonBag.pbQuantity(:INFINITEREVERSERS) > 0
|
||||
else
|
||||
commands[cmdFuse = commands.length] = _INTL("Fuse")
|
||||
end
|
||||
@@ -2285,7 +2285,7 @@ class PokemonStorageScreen
|
||||
if Kernel.pbConfirmMessageSerious(_INTL("Should {1} be reversed?", pokemon.name))
|
||||
reverseFusion(pokemon)
|
||||
end
|
||||
$PokemonBag.pbDeleteItem(:DNAREVERSER)
|
||||
$PokemonBag.pbDeleteItem(:DNAREVERSER) if $PokemonBag.pbQuantity(:INFINITEREVERSERS) <= 0
|
||||
end
|
||||
|
||||
def pbUnfuseFromPC(selected)
|
||||
|
||||
@@ -668,7 +668,7 @@ end
|
||||
#
|
||||
#===============================================================================
|
||||
def pbPokemonMart(stock,speech=nil,cantsell=false)
|
||||
if $game_switches[SWITCH_RANDOM_ITEMS] && $game_switches[SWITCH_RANDOM_SHOP_ITEMS]
|
||||
if $game_switches[SWITCH_RANDOM_ITEMS_GENERAL] && $game_switches[SWITCH_RANDOM_SHOP_ITEMS]
|
||||
stock = replaceShopStockWithRandomized(stock)
|
||||
end
|
||||
|
||||
|
||||
@@ -235,7 +235,7 @@ class RandomizerWildPokemonOptionsScene < PokemonOption_Scene
|
||||
proc { $game_switches[SWITCH_RANDOM_WILD_ONLY_CUSTOMS] ? 0 : 1 },
|
||||
proc { |value|
|
||||
$game_switches[SWITCH_RANDOM_WILD_ONLY_CUSTOMS] = value == 0
|
||||
}, "(For 'Fuse everything' and starters) Randomize only to Pokémon that have a custom sprite."
|
||||
}, "['Fuse everything' & starters] Include only Pokémon with a custom sprite."
|
||||
)
|
||||
|
||||
options << EnumOption.new(_INTL("Starters"), [_INTL("On"), _INTL("Off")],
|
||||
|
||||
Reference in New Issue
Block a user