minor randomizer fixes + infinite dna reverse from pc

This commit is contained in:
infinitefusion
2022-09-24 09:45:22 -04:00
parent ec64343fd0
commit 3db17e3f75
20 changed files with 11 additions and 11 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1803,7 +1803,7 @@ class PokeBattle_Move_05E < PokeBattle_Move
def pbEffectGeneral(user) def pbEffectGeneral(user)
newType = @newTypes[@battle.pbRandom(@newTypes.length)] newType = @newTypes[@battle.pbRandom(@newTypes.length)]
user.pbChangeTypes(newType) 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)) @battle.pbDisplay(_INTL("{1} transformed into the {2} type!",user.pbThis,typeName))
end end
end end

View File

@@ -421,12 +421,12 @@ class PokemonSummary_Scene
# break # break
# end # end
# end # end
if dexnum <= 0 # if dexnum <= 0
textpos.push(["???", 435, 74, 2, dexNumBase, dexNumShadow]) # textpos.push(["???", 435, 74, 2, dexNumBase, dexNumShadow])
else # else
dexnum -= 1 if dexnumshift # dexnum -= 1 if dexnumshift
textpos.push([sprintf("%03d", dexnum), 435, 74, 2, dexNumBase, dexNumShadow]) # textpos.push([sprintf("%03d", dexnum), 435, 74, 2, dexNumBase, dexNumShadow])
end # end
# Write Original Trainer's name and ID number # Write Original Trainer's name and ID number
if @pokemon.owner.name.empty? if @pokemon.owner.name.empty?
textpos.push([_INTL("RENTAL"), 435, 170, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)]) textpos.push([_INTL("RENTAL"), 435, 170, 2, Color.new(64, 64, 64), Color.new(176, 176, 176)])

View File

@@ -1660,7 +1660,7 @@ class PokemonStorageScreen
if pokemon != nil if pokemon != nil
if dexNum(pokemon.species) > NB_POKEMON if dexNum(pokemon.species) > NB_POKEMON
commands[cmdUnfuse = commands.length] = _INTL("Unfuse") 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 else
commands[cmdFuse = commands.length] = _INTL("Fuse") commands[cmdFuse = commands.length] = _INTL("Fuse")
end end
@@ -2285,7 +2285,7 @@ class PokemonStorageScreen
if Kernel.pbConfirmMessageSerious(_INTL("Should {1} be reversed?", pokemon.name)) if Kernel.pbConfirmMessageSerious(_INTL("Should {1} be reversed?", pokemon.name))
reverseFusion(pokemon) reverseFusion(pokemon)
end end
$PokemonBag.pbDeleteItem(:DNAREVERSER) $PokemonBag.pbDeleteItem(:DNAREVERSER) if $PokemonBag.pbQuantity(:INFINITEREVERSERS) <= 0
end end
def pbUnfuseFromPC(selected) def pbUnfuseFromPC(selected)

View File

@@ -668,7 +668,7 @@ end
# #
#=============================================================================== #===============================================================================
def pbPokemonMart(stock,speech=nil,cantsell=false) 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) stock = replaceShopStockWithRandomized(stock)
end end

View File

@@ -235,7 +235,7 @@ class RandomizerWildPokemonOptionsScene < PokemonOption_Scene
proc { $game_switches[SWITCH_RANDOM_WILD_ONLY_CUSTOMS] ? 0 : 1 }, proc { $game_switches[SWITCH_RANDOM_WILD_ONLY_CUSTOMS] ? 0 : 1 },
proc { |value| proc { |value|
$game_switches[SWITCH_RANDOM_WILD_ONLY_CUSTOMS] = value == 0 $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")], options << EnumOption.new(_INTL("Starters"), [_INTL("On"), _INTL("Off")],

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.