other stuff missing from previous commit

This commit is contained in:
chardub
2023-01-06 19:04:50 -05:00
parent e7854f8afb
commit 599da9a390
9 changed files with 7 additions and 57 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -414,9 +414,6 @@ def getCustomSpeciesList()
for num in 1..NB_POKEMON for num in 1..NB_POKEMON
path = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + num.to_s + "/*" path = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + num.to_s + "/*"
filesList = Dir[path] filesList = Dir[path]
echo filesList
echo "\n\n"
maxDexNumber = (NB_POKEMON * NB_POKEMON) + NB_POKEMON maxDexNumber = (NB_POKEMON * NB_POKEMON) + NB_POKEMON
maxVal = filesList.length - 1 maxVal = filesList.length - 1
for i in 0..maxVal for i in 0..maxVal

View File

@@ -585,21 +585,6 @@ class PokemonFusionScene
else else
avgLevel = (2 * level2 + level1) / 3 avgLevel = (2 * level2 + level1) / 3
end end
####CAPTURE RATES
####Check success Poke 1
# if (fusionCheckSuccess (30, leveldiff, level1,fusionmultiplier)) then
# return 1
# else
# return 0
#end
####Check success Poke 2
# if (fusionCheckSuccess (30, leveldiff, level1,fusionmultiplier)) then
# return 1
# else
# return 0
# end
return 1 return 1
end end

View File

@@ -116,6 +116,7 @@ VAR_RIVAL_STARTER=250
VAR_FUSION_ICON_STYLE=220 VAR_FUSION_ICON_STYLE=220
VAR_SHINY_HUE_OFFSET=275 VAR_SHINY_HUE_OFFSET=275
VAR_CURRENT_HIDDEN_MAP = 226 VAR_CURRENT_HIDDEN_MAP = 226
VAR_FUSE_COUNTER = 126
#Randomizer #Randomizer
VAR_RANDOMIZER_WILD_POKE_BST=197 VAR_RANDOMIZER_WILD_POKE_BST=197

View File

@@ -5,7 +5,7 @@ HIDDEN_MAP_ALWAYS = [178,655,570,356]
RANDOM_HIDDEN_MAP_LIST = [8,109,431,446,402,403,467,468,10,23,167,16,19,78,185,86, RANDOM_HIDDEN_MAP_LIST = [8,109,431,446,402,403,467,468,10,23,167,16,19,78,185,86,
491,90,40,342,490,102,103,104,105,106,1,12,413,445,484,485,486,140,350,146, 491,90,40,342,490,102,103,104,105,106,1,12,413,445,484,485,486,140,350,146,
149,304,356,307,409,351,495,154,349,322,323,544,198,144,155,444,58,59,229,52,53,54, 149,304,356,307,409,351,495,154,349,322,323,544,198,144,155,444,58,59,229,52,53,54,
55,98,173,174,181,187,95,159,162,437,220,440,438,57,171,172,528,265,288,364,329, 55,98,173,174,181,187,95,159,162,437,440,438,57,171,172,528,265,288,364,329,
335,254,261,262,266,230,145,147,258,284,283,267,586,285,286,287,300,311,47,580,529, 335,254,261,262,266,230,145,147,258,284,283,267,586,285,286,287,300,311,47,580,529,
635,638,646,560,559,526,600,564,594,566,562,619,563,603,561,597,633,640,641,621,312, 635,638,646,560,559,526,600,564,594,566,562,619,563,603,561,597,633,640,641,621,312,
670,692,643,523,698, 670,692,643,523,698,

View File

@@ -379,8 +379,11 @@ ItemHandlers::UseFromBag.add(:ODDKEYSTONE, proc { |item|
}) })
def useDreamMirror def useDreamMirror
map_name = Kernel.getMapName(pbGet(226)).to_s visitedMap = $PokemonGlobal.visitedMaps[pbGet(226)]
map_name = visitedMap ? Kernel.getMapName(pbGet(226)).to_s : "an unknown location"
Kernel.pbMessage(_INTL("You peeked into the Dream Mirror...")) Kernel.pbMessage(_INTL("You peeked into the Dream Mirror..."))
Kernel.pbMessage(_INTL("You can see a faint glimpse of {1} in the reflection.", map_name)) Kernel.pbMessage(_INTL("You can see a faint glimpse of {1} in the reflection.", map_name))
end end
@@ -1384,50 +1387,14 @@ end
def pbFuse(pokemon, poke2, supersplicers = false) def pbFuse(pokemon, poke2, supersplicers = false)
newid = (pokemon.species_data.id_number) * NB_POKEMON + poke2.species_data.id_number newid = (pokemon.species_data.id_number) * NB_POKEMON + poke2.species_data.id_number
# pathCustom = _INTL("Graphics/CustomBattlers/{1}.{2}.png", poke2.species_data.id_number, pokemon.species_data.id_number)
# hasCustom = false
# if (pbResolveBitmap(pathCustom))
# picturePath = pathCustom
# hasCustom = true
# else
# picturePath = _INTL("Graphics/Battlers/{1}/{1}.{2}.png", poke2.species_data.id_number, pokemon.species_data.id_number)
# end
# previewwindow = PictureWindow.new(picturePath)
#
# new_level = calculateFusedPokemonLevel(pokemon.level, poke2.level, supersplicers)
# typeWindow = drawPokemonType(newid)
# drawFusionPreviewText(typeWindow, "Lv. " + new_level.to_s, 232, 0,)
#
# if !$Trainer.seen?(newid)
# if hasCustom
# previewwindow.picture.pbSetColor(150, 255, 150, 200)
# else
# previewwindow.picture.pbSetColor(255, 255, 255, 200)
# end
# end
# previewwindow.x = (Graphics.width / 2) - (previewwindow.width / 2)
# previewwindow.y = ((Graphics.height - 96) / 2) - (previewwindow.height / 2)
# previewwindow.z = 1000000
#if (Kernel.pbConfirmMessage(_INTL("Fuse the two Pokémon?", newid)))
# previewwindow.dispose
# typeWindow.dispose
fus = PokemonFusionScene.new fus = PokemonFusionScene.new
if (fus.pbStartScreen(pokemon, poke2, newid)) if (fus.pbStartScreen(pokemon, poke2, newid))
returnItemsToBag(pokemon, poke2) returnItemsToBag(pokemon, poke2)
fus.pbFusionScreen(false, supersplicers) fus.pbFusionScreen(false, supersplicers)
$game_variables[126] += 1 #fuse counter $game_variables[VAR_FUSE_COUNTER] += 1 #fuse counter
fus.pbEndScreen fus.pbEndScreen
return true return true
end end
# else
# # previewwindow.dispose
# # typeWindow.dispose
# return false
# end
end end
def pbUnfuse(pokemon, scene, supersplicers, pcPosition = nil) def pbUnfuse(pokemon, scene, supersplicers, pcPosition = nil)

BIN
x64-msvcrt-ruby310.dll Normal file

Binary file not shown.